0.12dev: Merged [7580-7581] from 0.11-stable.
Authored by: rblank 2008-10-03
Parent: [r7581]
Child: [r7583]