Commiting non-working code so I can sync with the trunk.
Authored by: jimwinston 2010-04-12
Parent: [r747]
Child: [r749]