More changes to prepare hand-over
Authored by: Matthias_Feil 2010-08-05
Parent: [r12258]
Child: [r12260]