Merged the JAFFA_2_0 branch into the HEAD branch
Authored by: gautamj 2003-10-21
Parent: [r592]
Child: [r594]