merge [74470], [74481], [74513], [74527] from trunk; fixes #4723, #5905

[SVN r74534]
This commit is contained in:
Eric Niebler 2011-09-23 15:04:13 +00:00
parent 96b5c52008
commit 0178f292cc
2 changed files with 2 additions and 1 deletions

@ -1 +1 @@
Subproject commit 71555e741316d97c513e8860e760b3cfa2a52685
Subproject commit 80cbfcf32f463d4bafa6d070234fc8d544d24316

View file

@ -2750,6 +2750,7 @@ for more information.
<toolset name="sun-5.10"/>
<toolset name="borland-*"/>
<toolset name="vacpp"/>
<toolset name="vacpp-*"/>
</mark-unusable>
</library>