Merged [5730:5732/trunk] with svnmerge.
Authored by: jruigrok 2007-06-22
Parent: [r5734]
Child: [r5736]