0.12dev: merging ChangeLog part of r7891
Authored by: cboos 2009-02-18
Parent: [r7906]
Child: [r7908]