Merged Release-5-5-2 branch into HEAD
Authored by: jost_boekemeier 2009-09-14
Parent: [r863]
Child: [r865]