[gnome-settings-daemon/gnome-3-12] 3.12.2

[Bastien Nocera <hadess src gnome org>]

commit d4d913f17edda1330a292f5f7dc40659a56801b3
Author: Bastien Nocera <hadess hadess net>
Date:   Mon May 5 16:54:41 2014 +0200

    3.12.2

 NEWS         |   16 ++++++++++++++++
 configure.ac |    2 +-
 2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/NEWS b/NEWS
index 02c9174..1db1eb1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,20 @@
 ==============
+Version 3.12.2
+==============
+
+- Fix crasher when plugging in an external display into a laptop
+  with a touchscreen
+
+Power:
+- Fix brighntess sliders and OSD starting at zero when first used
+- Fix display not blanking after gnome-shell wake up
+- Fix wake up not working in some cases
+- Fix laptop sometimes not suspending when unplugging from a dock
+- Fix double-suspend when suspending after a timeout
+- Fix erratic backlight behaviour when the machine has a limited number
+  of backlight settings
+
+==============
 Version 3.12.1
 ==============
 
diff --git a/configure.ac b/configure.ac
index d5b51f3..501cb43 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ([2.60])
 
 AC_INIT([gnome-settings-daemon],
-        [3.12.1],
+        [3.12.2],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-settings-daemon])
 
 AC_CONFIG_SRCDIR([gnome-settings-daemon/gnome-settings-manager.c])