merge from trunk at 97714

svn path=/branches/jb/ml2/mcs/; revision=99176

diff --cc mcs/class/System.Core/Makefile
index 8ade2906eaec18682d84a40451948680421e8849,8ade2906eaec18682d84a40451948680421e8849..a3f00fbc330dcd93ed9bcebcf29cbe075924e7fb
--- 1/mcs/class/System.Core/Makefile
--- 2/mcs/class/System.Core/Makefile
+++ b/mcs/class/System.Core/Makefile
@@@ -13,7 -13,7 +13,7 @@@ endi
  TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
  
  # This is a .NET > 2.0 only assembly
--VALID_PROFILE := $(filter net_2_0_bootstrap net_2_0 net_2_1_raw, $(PROFILE))
++VALID_PROFILE := $(filter net_2_0_bootstrap net_2_0 net_2_1_bootstrap net_2_1_raw, $(PROFILE))
  ifndef VALID_PROFILE
  LIBRARY_NAME = dummy-System.Core.dll
  NO_INSTALL = yes