WorkflowUpgrade: prepare /trunk for merge
Authored by: ecarter 2007-06-21
Parent: [r5729]
Child: [r5731]