Merge fixes from Trunk: mainly VC10 compatibility fixes.

[SVN r62833]
This commit is contained in:
John Maddock 2010-06-12 09:30:03 +00:00
parent f5df511f92
commit 1ef8490f36

@ -1 +1 @@
Subproject commit 28621aebb68d6db17bec6a8f9915fc762a09cc88
Subproject commit bc910c768d688bdc649c3af4d382d48e7b39de5e