Reverse merge or previous version. Commited by mistake.
Authored by: bartpved 2012-08-31
Parent: [r203]
Child: [r205]