0.12dev: Merged [7611-7613] from 0.11-stable.
Authored by: rblank 2008-10-28
Parent: [r7613]
Child: [r7615]