diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 714c5a403e8fdadf29a6f2ff86ac7cb69030396f..94defdb959c721663ab0a6132d77766f2996851a 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,6 @@
 // $Id$
 
-Drupal 6.0, xxxx-xx-xx (development version)
+Drupal 6.0, 2008-02-13
 ----------------------
 - New, faster and better menu system.
 - New watchdog as a hook functionality.
diff --git a/includes/common.inc b/includes/common.inc
index 697a1ec11ee1eaa40ec1e0abcf5231e6a23b0f44..f6ec43c952be4b449ef0136acfe292502d8ed016 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -577,7 +577,7 @@ function drupal_error_handler($errno, $message, $filename, $line, $context) {
     return;
   }
 
-  if ($errno & (E_ALL)) {
+  if ($errno & (E_ALL ^ E_NOTICE)) {
     $types = array(1 => 'error', 2 => 'warning', 4 => 'parse error', 8 => 'notice', 16 => 'core error', 32 => 'core warning', 64 => 'compile error', 128 => 'compile warning', 256 => 'user error', 512 => 'user warning', 1024 => 'user notice', 2048 => 'strict warning', 4096 => 'recoverable fatal error');
 
     // For database errors, we want the line number/file name of the place that
diff --git a/modules/system/system.module b/modules/system/system.module
index 32f1659ec7cd4c72e8be753b06303e404a8d5abd..38c05ca795825042e1fedd2abb2eb66960a216ab 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -9,7 +9,7 @@
 /**
  * The current system version.
  */
-define('VERSION', '6.0-dev');
+define('VERSION', '6.0');
 
 /**
  * Core API compatibility.