Merge branch 'master' into import-system-xml-4

diff --cc mcs/class/System.XML/Makefile
index cac430470ce59150df94c042502d3364888967e0,2d0d84be4fab6183c8ab982c411b218489a9e764..12ab2967cdfa176cfb1de252b7b33361fbd7f78a
--- 1/mcs/class/System.XML/Makefile
--- 2/mcs/class/System.XML/Makefile
+++ b/mcs/class/System.XML/Makefile
@@@ -20,10 -16,9 +20,10 @@@ endi
  PROFILE_ANY_MOBILE := $(filter monotouch monotouch_runtime monodroid xammac mobile mobile_static, $(PROFILE))
  
  LIB_REFS = System
- LIB_MCS_FLAGS = -r:$(corlib) -r:System.dll -nowarn:0618,0612,0642 -unsafe -d:ASYNC -d:DISABLE_CAS_USE -d:MONO_HYBRID_SYSTEM_XML
 -LIB_MCS_FLAGS = -r:$(corlib) -nowarn:0618,0612,0642
++LIB_MCS_FLAGS = -r:$(corlib)  -nowarn:0618,0612,0642 -unsafe -d:ASYNC -d:DISABLE_CAS_USE -d:MONO_HYBRID_SYSTEM_XML
 +
  ifeq (2.1, $(FRAMEWORK_VERSION))
 -LIB_MCS_FLAGS += -unsafe -d:AGCLR -d:NET_2_1_HACK
 +LIB_MCS_FLAGS += -unsafe -d:AGCLR -d:NET_2_1_HACK -d:DISABLE_XSLT_COMPILER -d:DISABLE_XSLT_SCRIPT
  endif
  TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169 -r:System.Data.dll -r:System.Core.dll