0.12dev: Merged [7716] from 0.11-stable.
Authored by: rblank 2008-11-27
Parent: [r7716]
Child: [r7718]