Merged the 'JAFFA_1_3' into the 'HEAD' branch
Authored by: exeunt 2003-09-17
Parent: [r453]
Child: [r455]