holdover fixed, seems to be working now
Authored by: manuelschneider 2010-10-18
Parent: [r13084]
Child: [r13086]