0.12dev: Merged [7772] from 0.11-stable.
Authored by: rblank 2008-12-26
Parent: [r7772]
Child: [r7774]