0.12dev: Merged [7695-7696] from 0.11-stable.
Authored by: rblank 2008-11-17
Parent: [r7696]
Child: [r7698]