- fixed compiling errors that were caused by the merging
Authored by: thzs 2007-03-04
Parent: [r367]
Child: [r369]
