Manually merged the recent changes from JAFFA_5_7_RELEASE branch
Authored by: gautamj 2011-05-23
Parent: [r5294]
Child: [r5296]