0.12dev: Blocked 7693 from merging, as it was backported from trunk [7678].
Authored by: rblank 2008-11-17
Parent: [r7693]
Child: [r7695]
