Integrate with latest API changes.
Authored by: briggs@adobe.com 2010-02-02
Parent: [r971]
Child: [r973]