Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.579
diff -u -d -F^\s*function -r1.579 common.inc
--- includes/common.inc	9 Oct 2006 06:47:22 -0000	1.579
+++ includes/common.inc	11 Oct 2006 18:21:00 -0000
@@ -328,6 +328,8 @@ function drupal_not_found() {
 
   $path = drupal_get_normal_path(variable_get('site_404', ''));
   if ($path && $path != $_GET['q']) {
+    $_GET['q'] = $path;
+    _menu_append_contextual_items();
     menu_set_active_item($path);
     $return = menu_execute_active_handler();
   }
@@ -357,6 +359,8 @@ function drupal_access_denied() {
 
   $path = drupal_get_normal_path(variable_get('site_403', ''));
   if ($path && $path != $_GET['q']) {
+    $_GET['q'] = $path;
+    _menu_append_contextual_items();
     menu_set_active_item($path);
     $return = menu_execute_active_handler();
   }