Merge 'SupportSimpleObjectAsCompositePart' branch to trunk
Authored by: ozzy.ext 2011-10-19
Parent: [r369]
Child: [r371]