Merge with revisions 5862-5867,5874-5875,5877,5879,5883.
Authored by: jruigrok 2007-08-15
Parent: [r5918]
Child: [r5920]