On our way to 2.2 we found a bug in 2.1 and our repo is now 2.1.1 :)  No need to branch for that.

--HG--
branch : trunk
diff --git a/setup.py b/setup.py
index 439ce9f..2f1c3e7 100644
--- a/setup.py
+++ b/setup.py
@@ -49,7 +49,7 @@
 
 #: don't change the variable and assignment.  the fabfile parses this
 #: file to get the version for deployment from it.
-VERSION = '2.2'
+VERSION = '2.1.1'
 
 
 data_files = []