Attempted fix for unit tests failure.
Authored by: briggs@adobe.com 2010-05-05
Parent: [r1645]
Child: [r1647]