Patches for Codegear C++ Builder 2009
Merge from trunk
Merge from trunk