0.11-stable: Moving the branch back into dev mode.
Authored by: jonas 2008-11-17
Parent: [r7691]
Child: [r7693]