0.12dev: Merged [7915] from 0.11-stable.
Authored by: rblank 2009-02-22
Parent: [r7915]
Child: [r7917]