Integrate fixes from sprint9 branch.
Authored by: briggs@adobe.com 2010-01-28
Parent: [r934]
Child: [r936]