hopefully fixed all compilation-problems
Authored by: dan-ro 2012-09-06
Parent: [r20886]
Child: [r20888]