From 469d4ac68ab886d18c5ec246a2afe62951264a4a Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 13 May 2013 08:26:41 -0400
Subject: [PATCH] 2.36.2

---
 NEWS         | 20 ++++++++++++++++++++
 configure.ac |  4 ++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index abdd4ff2e..48bb82bd7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,23 @@
+Overview of changes fron GLib 2.36.1 to 2.36.2
+==============================================
+
+* Bug fixes:
+ 697887 GVariant: fix transfer annotation
+ 699485 tests/mappedfile: Also handle ENOMEM
+ 699493 SOCKS5 proxy code crashes if it cannot authenticate
+ 699500 gbitlock: fix this to not unconditionally use futex emu...
+        Fix a hang in pidgin
+
+* Translation updates:
+ Indonesian
+ Italian
+ Lithuanian
+ Norwegian bokmål
+ Polish
+ Serbian
+ Slovenian
+
+
 Overview of changes fron GLib 2.36.0 to 2.36.1
 ==============================================
 
diff --git a/configure.ac b/configure.ac
index f122a184e..e933bb859 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,8 +31,8 @@ m4_define(glib_configure_ac)
 
 m4_define([glib_major_version], [2])
 m4_define([glib_minor_version], [36])
-m4_define([glib_micro_version], [1])
-m4_define([glib_interface_age], [1])
+m4_define([glib_micro_version], [2])
+m4_define([glib_interface_age], [2])
 m4_define([glib_binary_age],
           [m4_eval(100 * glib_minor_version + glib_micro_version)])
 m4_define([glib_version],