reverted to revision < 10334 to fix compile problems
Authored by: mrieser 2010-02-15
Parent: [r10421]
Child: [r10423]