0.12dev: Merged [7769:7770] from 0.11-stable.
Authored by: rblank 2008-12-19
Parent: [r7770]
Child: [r7772]