From 18d4e92dadf60cb54b7f98f8b60e328cfdabb131 Mon Sep 17 00:00:00 2001
From: Dan Winship <danw@gnome.org>
Date: Mon, 25 Jan 2010 18:01:08 -0500
Subject: [PATCH] 2.29.6

---
 NEWS         | 13 +++++++++++++
 configure.in |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 2ee74c9..bc7c0b1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,16 @@
+Changes in libsoup from 2.29.5 to 2.29.6:
+
+	* Fixed SoupContentDecoder to ignore trailing junk after the
+          encoded message body (as other browsers do), rather than
+          getting stuck in an infinite loop. [#606352]
+
+	* Fixed an invalid read in soup_cookie_applies_to_uri()
+	  [#607024, pointed out by Xan]
+
+	* Fixed linking on OS X [#606959]
+
+	* Removed a harmless warning in SoupServer. [#606645]
+
 Changes in libsoup from 2.29.3 to 2.29.5:
 
 	* Added SoupContentDecoder, providing support for
diff --git a/configure.in b/configure.in
index bc6c56f..c9f25bc 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ dnl *** Initialize automake and set version ***
 dnl *******************************************
 
 AC_PREREQ(2.53)
-AC_INIT(libsoup, 2.29.5)
+AC_INIT(libsoup, 2.29.6)
 AC_CONFIG_SRCDIR(libsoup-2.4.pc.in)
 AC_CONFIG_MACRO_DIR([m4])
 
-- 
2.7.4