[gnome-settings-daemon] 2.91.4

[Bastien Nocera <hadess src gnome org>]

commit 43346b2599ea8c62f138abb4daf6ecb328872426
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Nov 25 12:55:41 2010 +0000

    2.91.4
    
    And update POTFILE.in and POTFILES.skip, as well as the
    gnome-desktop requirements

 NEWS             |   14 ++++++++++++++
 configure.ac     |    4 ++--
 po/POTFILES.in   |    1 +
 po/POTFILES.skip |    4 ++++
 4 files changed, 21 insertions(+), 2 deletions(-)
---
diff --git a/NEWS b/NEWS
index 9f0a95f..ee988f8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,18 @@
 ==============
+Version 2.91.4
+==============
+
+- Add Wacom configuration plugin (Peter Hutterer)
+- Add support for the XF86TouchpadOn/Off keys (Bastien Nocera)
+- Move some gnome-power-manager settings, so it can
+  be used in the control center (Richard Hughes)
+- Only ever call g_bus_own_name() once for the main D-Bus name (BN)
+- Register with gnome-session to avoid timeouts, and transition
+  problems on login (BN)
+- Fix possible warnings or crashers when _stop() is called without
+  _start() having been completed (William Jon McCann)
+
+==============
 Version 2.91.3
 ==============
 
diff --git a/configure.ac b/configure.ac
index e5939d8..3e63b5d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ([2.60])
 
 AC_INIT([gnome-settings-daemon],
-        [2.91.3],
+        [2.91.4],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-settings-daemon])
 
 AC_CONFIG_SRCDIR([gnome-settings-daemon/gnome-settings-manager.c])
@@ -54,7 +54,7 @@ GLIB_REQUIRED_VERSION=2.17.3
 GTK_REQUIRED_VERSION=2.91.0
 GCONF_REQUIRED_VERSION=2.6.1
 GIO_REQUIRED_VERSION=2.17.3
-GNOME_DESKTOP_REQUIRED_VERSION=2.91.2
+GNOME_DESKTOP_REQUIRED_VERSION=2.91.3
 LIBNOTIFY_REQUIRED_VERSION=0.6.1
 
 EXTRA_COMPILE_WARNINGS(yes)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 99b2cad..685595a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -10,6 +10,7 @@ data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
 data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
 data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in.in
 data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in.in
+data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in
 gnome-settings-daemon/main.c
 [type: gettext/ini]plugins/a11y-keyboard/a11y-keyboard.gnome-settings-plugin.in
 plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 8c9abda..9eaba54 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -14,3 +14,7 @@ data/org.gnome.settings-daemon.plugins.keyboard.gschema.xml.in
 data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in
 data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in
 data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in
+data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in
+data/org.gnome.settings-daemon.plugins.power.gschema.xml.in
+data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in
+data/org.gnome.settings-daemon.plugins.power.gschema.xml.in