- merged latest trunk changes (rev 502) into the branch
Authored by: thzs 2007-05-06
Parent: [r504]
Child: [r506]