[gnome-desktop/gnome-3-6] Release 3.6.1

[Colin Walters <walters src gnome org>]

commit ccd9313f4cdd17b0e55f699fb3d35094e618396d
Author: Colin Walters <walters verbum org>
Date:   Wed Oct 17 11:38:48 2012 -0400

    Release 3.6.1

 NEWS         |   29 +++++++++++++++++++++++++++++
 configure.ac |    4 ++--
 2 files changed, 31 insertions(+), 2 deletions(-)
---
diff --git a/NEWS b/NEWS
index d0931c2..160c82e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,33 @@
 ===============
+Version 3.6.1
+===============
+
+Bastien Nocera (2):
+      wall-clock: Add test application
+      wall-clock: Add debug when timezone or schema changes
+
+Carles Ferrando (1):
+      [l10n] Updated Catalan (Valencian) translation
+
+Colin Walters (1):
+      Release 3.6.1
+
+Cosimo Cecchi (3):
+      rr-labeler: clear surface before drawing frame and background
+      rr-labeler: use a shape region if the widget is not composited
+      rr-labeler: scale the corner radii when drawing the fill
+
+Daniel Korostil (2):
+      Added uk translation
+      Added uk translation
+
+Daniel Martinez Cucalon (1):
+      Updated Aragonese translation
+
+Gil Forcada (1):
+      [l10n] Updated Catalan translation
+
+===============
 Version 3.6.0.1
 ===============
 
diff --git a/configure.ac b/configure.ac
index a2142e7..aad8a62 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
 m4_define(gnome_platform, 3)
 m4_define(gnome_minor, 6)
-m4_define(gnome_micro, 0)
+m4_define(gnome_micro, 1)
 dnl gnome_sub is an optional sub-version which will not be advertised to the user
 dnl It allows to release a 2.30.1.1 which is just a better 2.30.1
 dnl Leave empty if not needed
-m4_define(gnome_sub, 1)
+m4_define(gnome_sub,)
 
 m4_define(gnome_version, [gnome_platform.gnome_minor.gnome_micro]m4_ifval(gnome_sub, .gnome_sub)),