0.11-stable: Bringing the branch back to stable state.
Authored by: jonas 2008-08-06
Parent: [r7451]
Child: [r7453]