Minor adjustment to the Mouse handbook. This relates to bug 1850.

diff --git a/doc/kcontrol/mouse/index.docbook b/doc/kcontrol/mouse/index.docbook
index 439eaaf..76312e6 100644
--- a/doc/kcontrol/mouse/index.docbook
+++ b/doc/kcontrol/mouse/index.docbook
@@ -46,7 +46,7 @@
 </para>
 
 <sect2 id="mouse-general">
-<title><guilabel>General</guilabel></title>
+<title>General</title>
 
 <variablelist>
 <varlistentry>
@@ -128,7 +128,7 @@
 </sect2>
 
 <sect2 id="cursor-theme">
-<title><guilabel>Cursor Theme</guilabel></title>
+<title>Cursor Theme</title>
 
 <para>
 This tab allows you to select from a number of cursor themes. A preview of the cursor display is shown above the listbox.
@@ -240,7 +240,7 @@
 </sect2>
 
 <sect2 id="mouse-navigation">
-<title><guilabel>Mouse Navigation</guilabel></title>
+<title>Mouse Navigation</title>
 
 <para>
 This tab allows you to configure the keyboard number pad keys as a mouse-type device. This may be useful when you are working on a device without another pointing device, or where you have no other use for the number pad.
@@ -310,7 +310,7 @@
 </sect2>
 
 <sect2 id="logitech-mouse">
-<title><guilabel>Logitech Support</guilabel></title>
+<title>Logitech Support</title>
 
 <para>
 Some Logitech USB mice support special features, such as switching to a higher resolution, or

Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase

diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc
index ce3be3f..79799d1 100644
--- a/kdesktop/lock/main.cc
+++ b/kdesktop/lock/main.cc
@@ -529,13 +529,11 @@
             delete trinity_desktop_lock_process;
             trinity_desktop_lock_process = NULL;
 
-#if 0
             // FIXME
             // We should not have to return (restart) at all,
             // but it seems that some X11 connections are left active,
             // preventing the lock process from restarting properly in the while() loop above.
             return 0;
-#endif
         }
     }
 }