+ merging the platform-spec branch into trunk
Authored by: bworrell 2012-01-17
Parent: [r1090]
Child: [r1092]