0.12dev: Merged [7778] from 0.11-stable.
Authored by: rblank 2009-01-06
Parent: [r7778]
Child: [r7780]