Merge with revisions 5842,5849,5853-5854,5856-5859.
Authored by: jruigrok 2007-08-15
Parent: [r5916]
Child: [r5918]