[gh-170] Merging trunk into testing

git-svn-id: file:///tmp/wdn_thm_drupal/branches/drupal-7.x/staging@889 20a16fea-79d4-4915-8869-1ea9d5ebf173

README-UNL.txt

+Hacks of Core:
+
+includes/bootstrap.inc
+function drupal_settings_initialize()
+ * UNL change: include a "global" settings file that applies to all sites.
+
+------------------------------------
+
+sites/all/modules/drush/commands/core/drupal/site_install_7.inc
+function drush_core_site_install_version()
+ * UNL change! Setting this to FALSE because we don't want them and they're hard coded.
+
+------------------------------------

sites/all/modules/drush/commands/core/drupal/site_install_7.inc

@@ -36,8 +36,12 @@ function drush_core_site_install_version($profile) {
           ),
         ),
         'update_status_module' => array(
+          /*
+          UNL change! Setting this to FALSE because we don't want them and they're hard coded.
           1 => TRUE,
           2 => TRUE,
+          End UNL Change!
+          */
         ),
         'clean_url' => drush_get_option('clean-url', TRUE),
       ),