Merge lp:~superm1/xubuntu-default-settings/fix-gnome-screensaver into lp:~xubuntu-dev/xubuntu-default-settings/trunk

[Mario Limonciello]

=== modified file 'debian/changelog'
--- debian/changelog	2009-03-22 22:39:04 +0000
+++ debian/changelog	2009-04-11 15:40:46 +0000
@@ -1,3 +1,11 @@
+xubuntu-default-settings (0.54) jaunty; urgency=low
+
+  * etc/xdg/xubuntu/menus/xfce-applications.menu: Don't show the 
+    Screensavers menu.  It has no purpose. Instead we should be showing the
+    screensavers preferences utility. (LP: #350962)
+
+ -- Mario Limonciello <[e-mail]>  Sat, 11 Apr 2009 10:39:41 -0500
+
 xubuntu-default-settings (0.53) jaunty; urgency=low
 
   * etc/xdg/xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml: restore
 
=== modified file 'etc/xdg/xubuntu/menus/xfce-applications.menu'
--- etc/xdg/xubuntu/menus/xfce-applications.menu	2009-03-15 17:20:29 +0000
+++ etc/xdg/xubuntu/menus/xfce-applications.menu	2009-04-11 15:40:46 +0000
@@ -42,13 +42,6 @@
             <Merge type="all"/>
         </Layout>
         
-        <Menu>
-            <Name>Screensavers</Name>
-            <Directory>xfce-screensavers.directory</Directory>
-            <Include>
-                <Category>Screensaver</Category>
-            </Include>
-        </Menu>
     </Menu>
     
     <Menu>