0.12.1dev: Merged [10032] from 0.11-stable.
Authored by: osimons 2010-09-01
Parent: [r10032]
Child: [r10034]