Integrate fix for FM-241 into Flex branch.
Authored by: briggs@adobe.com 2009-12-02
Parent: [r577]
Child: [r579]