Attempting to switch from C to C++ (_WITHOUT_ starting over from scratch).
Authored by: debug 2009-06-27
Parent: [r5441]
Child: [r5443]