Merge lp:~osomon/unity-2d/unity-2d-default-settings-maverick-disablesuperkeybydefault into lp:~unity-2d-team/unity-2d/unity-2d-default-settings-maverick

[Olivier Tilloy]

Set the default value of the key that controls whether the super key invokes the dash to false.

=== modified file 'debian/20_unity-2d-gconf-default'
--- debian/20_unity-2d-gconf-default	2011-01-18 13:19:05 +0000
+++ debian/20_unity-2d-gconf-default	2011-01-27 18:11:36 +0000
@@ -1,5 +1,6 @@
 /apps/gnome-power-manager/lock/use_screensaver_settings true
 /apps/gnome-power-manager/general/use_time_for_policy false
+/desktop/unity/launcher/super_key_enable false
 /desktop/unity/launcher/favorites/favorites_list [app-firefox.desktop,app-empathy.desktop,app-evolution.desktop,app-cheese.desktop,app-rhythmbox.desktop,app-ubuntu-software-center.desktop,app-nautilus.desktop]
 /desktop/unity/launcher/favorites/app-firefox.desktop/type application
 /desktop/unity/launcher/favorites/app-firefox.desktop/desktop_file /usr/share/applications/firefox.desktop

=== modified file 'debian/changelog'
--- debian/changelog	2011-01-19 20:42:28 +0000
+++ debian/changelog	2011-01-27 18:11:36 +0000
@@ -1,3 +1,10 @@
+unity-2d-default-settings (0.1.34) UNRELEASED; urgency=low
+
+  * debian/20_unity-2d-gconf-default: Set the default value of the key that
+    controls whether the super key controls the dash to false. (LP: #705076)
+
+ -- Olivier Tilloy <[e-mail]>  Thu, 27 Jan 2011 19:05:30 +0100
+
 unity-2d-default-settings (0.1.33) maverick; urgency=low
 
   * Added transitional dummy package unity-qt-default-settings.