Integrate latest updates from OSMF RC into SMP trunk
Authored by: cdobre 2011-09-01
Parent: [r325]
Child: [r327]