From 87cd906b2b1a904062c0dbdb017029a3f3a33a5d Mon Sep 17 00:00:00 2001
From: Brian Aker <brian@tangent.org>
Date: Mon, 14 Feb 2011 10:35:59 -0800
Subject: [PATCH] Merge in version bump.

---
 ChangeLog    | 7 +++++--
 configure.ac | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ca2fe281..589f002a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
-  * Bug lp:633247
-
+0.46 Mon Feb 14 10:28:01 PST 2011
+  * Fixes a number of corner case bugs.
+  * Fixes related to OpenBSD.
+  * Better testing for protocol version.
+  * Removes special case infinite wait on blocking setup.
 
 0.45 Tue Feb  8 16:02:06 PST 2011
   * Add support for systemtap
diff --git a/configure.ac b/configure.ac
index 5b87bddc..8473f1bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@
 # the COPYING file in this directory for full text.
 
 AC_PREREQ(2.59)
-AC_INIT([libmemcached],[0.45],[http://libmemcached.org/])
+AC_INIT([libmemcached],[0.46],[http://libmemcached.org/])
 AC_CONFIG_SRCDIR([libmemcached/memcached.c])
 AC_CONFIG_AUX_DIR(config)
 
-- 
2.30.2