Fixed one todo and marked the next one
Authored by: hotzst 2009-03-02
Parent: [r1131]
Child: [r1133]