First take, compile fix needed from trunk, merge in a minute
Authored by: hartwork 2009-03-17
Parent: [r68]
Child: [r70]