0.11-stable: Moving branch back into dev mode
Authored by: jonas 2009-03-18
Parent: [r7955]
Child: [r7957]