Updating files from JAFFA_5_15_RELEASE to JAFFA_7.
Authored by: kevinmiro 2012-12-06
Parent: [r6501]
Child: [r6503]