Another compile fix. This time I actually made sure the whole thing compiles before committing.
Authored by: plombo 2010-11-07
Parent: [r2924]
Child: [r2926]