Merge with revisions 5888-5892,5897,5899-5902,5904-5909,5912.
Authored by: jruigrok 2007-08-15
Parent: [r5919]
Child: [r5921]