Applied patch send in by Daniel Gloeckner. Many, many thanks!!
Authored by: stefan_fendt 2008-08-20
Parent: [r3222]
Child: [r3224]
