All changes committed to avoid loss of data.
Authored by: jwjoubert 2011-01-18
Parent: [r14043]
Child: [r14045]