0.12dev: Merged [7794] from 0.11-stable.
Authored by: rblank 2009-01-13
Parent: [r7794]
Child: [r7796]