Merge from JAFFA_5_10_RELEASE to JAFFA_5_11_RELEASE
Authored by: erikb78 2011-10-26
Parent: [r5651]
Child: [r5653]