Refactoring towards the use of builders
Authored by: hotzst 2010-02-04
Parent: [r3007]
Child: [r3009]