merged HEAD to RC

[SVN r35338]

status/explicit-failures-markup.xml

@@ -3136,6 +3136,44 @@ for more information.
               source file</a> for details.
             </note>
         </test>
+
+        <mark-expected-failures>
+            <test name="maybe"/>
+            <toolset name="borland-5_6_4"/>
+            <toolset name="borland-5_8_2"/>
+            <toolset name="vc-6*"/>
+            <toolset name="vc-7_0"/>
+            <note refid="31" author="Daniel Wallin"/>
+        </mark-expected-failures>
+
+        <mark-expected-failures>
+            <test name="python-parameter-test"/>
+            <toolset name="borland-5_6_4"/>
+            <toolset name="borland-5_8_2"/>
+            <toolset name="vc-6*"/>
+            <toolset name="vc-7_0"/>
+            <note refid="31" author="Daniel Wallin"/>
+        </mark-expected-failures>
+
+        <mark-expected-failures>
+            <test name="python_test"/>
+            <toolset name="borland-5_6_4"/>
+            <toolset name="borland-5_8_2"/>
+            <toolset name="vc-6*"/>
+            <toolset name="vc-7_0"/>
+            <note refid="31" author="Daniel Wallin"/>
+        </mark-expected-failures>
+
+        <mark-expected-failures>
+            <test name="optional_deduced_sfinae"/>
+            <toolset name="vc-6*"/>
+            <toolset name="vc-7_0"/>
+            <note author="Daniel Wallin">
+              These compilers do not support SFINAE, so are expected to
+              fail this test.
+            </note>
+        </mark-expected-failures>
+
     </library>
 
      <!-- pointer container -->