Integrate fix for FM-218 into Flex4 branch.
Authored by: briggs@adobe.com 2009-11-25
Parent: [r553]
Child: [r555]