Unbreak MSVC6 debug build (thanks Andreas Kupries!)
Unbreak MSVC6 debug build (thanks Andreas Kupries!)
 merge trunk: