0.12dev now has all the changes it needs from 0.11-stable.
I had to merge a part of r7423 which couldn't apply in r7498, as r7390 was not merged by then.
Authored by: cboos 2008-09-12
Parent: [r7534]
Child: [r7536]
