Committing metadata merge refactoring.
Authored by: evrijkom@adobe.com 2009-11-20
Parent: [r530]
Child: [r532]