0.12dev: Merged [7825] from 0.11-stable.
Authored by: rblank 2009-02-04
Parent: [r7825]
Child: [r7827]