merge -r 60814:60815

svn path=/trunk/mcs/; revision=61296

diff --cc mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/ChangeLog
index eab066a5a94d129a4cffa2d2162c5a4d001593ef,b269739bcad1bc58b676c41ef2939512cd52a524..d46d892abf8a6d75d795a723b75d847489c2ed1a
--- 1/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/ChangeLog
--- 2/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/ChangeLog
+++ b/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/ChangeLog
@@@ -1,3 -1,7 +1,7 @@@
 -2006-05-18  Andrew Skiba <andrews@mainsoft.com>
++2006-05-31  Andrew Skiba <andrews@mainsoft.com>
+ 
+       * knownFailures.jvm.cs, xslttest.cs: add jvm specific known failures
+ 
  2006-04-03  Andrew Skiba <andrews@mainsoft.com>
        
        * xslt.vmwcsproj, xslt.sln: use project reference for nunit

diff --cc mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslttest.cs
Simple merge