0.11-stable: Moving branch back into dev mode.
Authored by: jonas 2009-02-15
Parent: [r7894]
Child: [r7896]