Merged changed from the new Jaffa_1_3_0 tag point into the Jaffa_2_0 Branch
Authored by: ut_paule 2003-10-09
Parent: [r551]
Child: [r553]