0.12dev: Merged [7930] from 0.11-stable.
Authored by: rblank 2009-03-02
Parent: [r7930]
Child: [r7932]