0.12dev: Merged [7765:7767] from 0.11-stable.
Authored by: rblank 2008-12-15
Parent: [r7767]
Child: [r7769]