Merge from JAFFA_5_10_RELEASE r5429-r5607
Authored by: erikb78 2011-10-19
Parent: [r5615]
Child: [r5617]