0.12dev: Merged [7913] from 0.11-stable.
Authored by: rblank 2009-02-20
Parent: [r7913]
Child: [r7915]