--- metacity/src/keybindings.c	Fri Feb 25 03:32:44 2005
+++ metacity-new/src/keybindings.c	Tue May 10 19:24:29 2005
@@ -360,6 +360,8 @@ static const MetaKeyHandler screen_handl
     GINT_TO_POINTER (32) },
   { META_KEYBINDING_COMMAND_WIN_SCREENSHOT, handle_run_command,
     GINT_TO_POINTER (33) },
+  { META_KEYBINDING_COMMAND_PROCESS_MANAGER, handle_run_command,
+    GINT_TO_POINTER (34) },
   { META_KEYBINDING_RUN_COMMAND_TERMINAL, handle_run_terminal,
     NULL },
   { NULL, NULL, NULL }
--- metacity/src/metacity.schemas.in	Tue May 10 19:06:08 2005
+++ metacity-new/src/metacity.schemas.in	Tue May 10 19:23:05 2005
@@ -1761,6 +1761,30 @@ you set
     </schema>
 
     <schema>
+      <key>/schemas/apps/metacity/global_keybindings/run_command_process_manager</key>
+      <applyto>/apps/metacity/global_keybindings/run_command_process_manager</applyto>
+      <owner>metacity</owner>
+      <type>string</type>
+      <default>&lt;Alt&gt;&lt;Ctrl&gt;Delete</default>
+      <locale name="C">
+         <short>Launch the process manager</short>
+         <long>
+          The keybinding which invokes the process manager allowing you to
+	  monitor and destroy processes.
+
+          The format looks like "&lt;Control&gt;a" or
+          "&lt;Shift&gt;&lt;Alt&gt;F1.
+
+          The parser is fairly liberal and allows lower or upper case,
+          and also abbreviations such as "&lt;Ctl&gt;" and
+          "&lt;Ctrl&gt;". If you set the option to the special string
+          "disabled", then there will be no keybinding for this
+          action.
+         </long>
+      </locale>
+    </schema>
+
+    <schema>
       <key>/schemas/apps/metacity/global_keybindings/run_command</key>
       <applyto>/apps/metacity/global_keybindings/run_command_1</applyto>
       <applyto>/apps/metacity/global_keybindings/run_command_2</applyto>
@@ -1823,6 +1847,22 @@ you set
          <short>The window screenshot command</short>
          <long>
          The /apps/metacity/global_keybindings/run_command_window_screenshot
+         key defines a keybinding which causes the command specified
+         by this setting to be invoked.
+         </long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/metacity/keybinding_commands/command_process_manager</key>
+      <applyto>/apps/metacity/keybinding_commands/command_process_manager</applyto>
+      <owner>metacity</owner>
+      <type>string</type>
+      <default>gnome-system-monitor</default>
+      <locale name="C">
+         <short>The process manager command</short>
+         <long>
+         The /apps/metacity/global_keybindings/run_command_process_manager
          key defines a keybinding which causes the command specified
          by this setting to be invoked.
          </long>
--- metacity/src/prefs.c	Fri Feb 25 03:32:44 2005
+++ metacity-new/src/prefs.c	Tue May 10 19:25:39 2005
@@ -33,9 +33,10 @@
 #define MAX_REASONABLE_WORKSPACES 36
 
 #define MAX_COMMANDS (32 + NUM_EXTRA_COMMANDS)
-#define NUM_EXTRA_COMMANDS 2
-#define SCREENSHOT_COMMAND_IDX (MAX_COMMANDS - 2)
-#define WIN_SCREENSHOT_COMMAND_IDX (MAX_COMMANDS - 1)
+#define NUM_EXTRA_COMMANDS 3
+#define SCREENSHOT_COMMAND_IDX (MAX_COMMANDS - 3)
+#define WIN_SCREENSHOT_COMMAND_IDX (MAX_COMMANDS - 2)
+#define PROCESS_MANAGER_COMMAND_IDX (MAX_COMMANDS - 1)
 
 /* If you add a key, it needs updating in init() and in the gconf
  * notify listener and of course in the .schemas file
@@ -1858,6 +1859,7 @@
   { META_KEYBINDING_COMMAND_32, NULL, FALSE },
   { META_KEYBINDING_COMMAND_SCREENSHOT, NULL, FALSE },
   { META_KEYBINDING_COMMAND_WIN_SCREENSHOT, NULL, FALSE },
+  { META_KEYBINDING_COMMAND_PROCESS_MANAGER, NULL, FALSE },
   { META_KEYBINDING_RUN_COMMAND_TERMINAL, NULL, FALSE },
   { NULL, NULL, FALSE}
 };
@@ -2508,6 +2510,10 @@
         {
           i = WIN_SCREENSHOT_COMMAND_IDX;
         }
+      else if (strcmp (p, "command_process_manager") == 0)
+        {
+          i = PROCESS_MANAGER_COMMAND_IDX;
+        }
       else
         {
           meta_topic (META_DEBUG_KEYBINDINGS,
@@ -2588,6 +2594,9 @@
     case WIN_SCREENSHOT_COMMAND_IDX:
       key = g_strdup (KEY_COMMAND_PREFIX "window_screenshot");
       break;
+    case PROCESS_MANAGER_COMMAND_IDX:
+      key = g_strdup (KEY_COMMAND_PREFIX "process_manager");
+      break;
     default:
       key = g_strdup_printf (KEY_COMMAND_PREFIX"%d", i + 1);
       break;
--- metacity/src/prefs.h	Fri Feb 25 03:32:44 2005
+++ metacity-new/src/prefs.h	Tue May 10 19:24:59 2005
@@ -153,6 +153,7 @@ void        meta_prefs_change_workspace_
 #define META_KEYBINDING_COMMAND_32               "run_command_32"
 #define META_KEYBINDING_COMMAND_SCREENSHOT       "run_command_screenshot"
 #define META_KEYBINDING_COMMAND_WIN_SCREENSHOT   "run_command_window_screenshot"
+#define META_KEYBINDING_COMMAND_PROCESS_MANAGER  "run_command_process_manager"
 #define META_KEYBINDING_RUN_COMMAND_TERMINAL     "run_command_terminal"
 
 /* Window bindings */