From 49e831a2dbc086035e1ca3a322a87e7decb397d0 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Thu, 12 Apr 2012 13:23:30 -0700
Subject: [PATCH] Version bump to fix merge conflict on pypi.

Change-Id: I7cac459da5817af96c1ab423b908a4d275ca9c75
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 9d2d579f2..df7b5b042 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ if sys.version_info < (2, 6):
 
 setup(
     name = "python-novaclient",
-    version = "2.6.0",
+    version = "2.6.0.1",
     description = "Client library for OpenStack Nova API",
     long_description = read('README.rst'),
     url = 'https://github.com/rackspace/python-novaclient',