Cleaning 2.0 branch. Better to restart from scratch.
Authored by: hampus_wessman 2009-01-09
Parent: [r290]
Child: [r292]