0.12dev: Merged [7860-7861] from 0.11-stable.
Authored by: rblank 2009-02-12
Parent: [r7861]
Child: [r7863]