Merge from JAFFA_5_12_RELEASE to trunk
Authored by: erikb78 2012-09-18
Parent: [r6358]
Child: [r6360]