Index: orca/src/orca/orca.in
===================================================================
RCS file: /cvs/gnome/orca/src/orca/orca.in,v
retrieving revision 1.18
diff -p -u -r1.18 orca.in
--- orca/src/orca/orca.in	7 Sep 2006 19:44:52 -0000	1.18
+++ orca/src/orca/orca.in	9 Nov 2006 17:15:27 -0000
@@ -90,7 +90,16 @@ runOrca()
     exec_prefix= prefix@
     PYTHONPATH= pyexecdir@
     export PYTHONPATH
+
+    # We'll save and restore the Caps_Lock as a modifier just in case
+    # the user is using the Caps_Lock as the Orca modifier key.
+    #
+    CAPSLOCKSETTING=`xmodmap | grep Caps_Lock | cut -f1`
     @PYTHON@ -c "import orca.orca; orca.orca.main()" "$ARGS"
+    if [ "x$CAPSLOCKSETTING" != "x" ]
+    then
+	xmodmap -e "add $CAPSLOCKSETTING = Caps_Lock" 
+    fi
 }
 
 # Runs a watchdog process in the background.  It merely attempts to
Index: orca/src/orca/orca.py
===================================================================
RCS file: /cvs/gnome/orca/src/orca/orca.py,v
retrieving revision 1.165
diff -p -u -r1.165 orca.py
--- orca/src/orca/orca.py	7 Nov 2006 19:19:01 -0000	1.165
+++ orca/src/orca/orca.py	9 Nov 2006 17:15:27 -0000
@@ -857,6 +857,10 @@ def loadUserSettings(script=None, inputE
         debug.println(debug.LEVEL_CONFIGURATION,
                       "Magnification module has NOT been initialized.")
 
+    for keyName in settings.orcaModifierKeys:
+        if keyName == "Caps_Lock":
+            os.system('xmodmap -e "clear Lock"')
+
     _showMainWindowGUI()
 
     httpserver.init()