Merge branch 'devel-2.2'

* devel-2.2:
  Release Ganeti 2.2.0.1
  Bump version to 2.2.1~rc0

Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Luca Bigliardi <shammash@google.com>

NEWS

 News
 ====
 
+Version 2.2.1 rc0
+-----------------
+
+*(Released Thu, 7 Oct 2010)*
+
+- Fixed issue 125, replace hardcoded “xenvg” in ``gnt-cluster`` with
+  value retrieved from master
+- Added support for blacklisted or hidden OS definitions
+- Added simple lock monitor (accessible via (``gnt-debug locks``)
+- Added support for -mem-path in KVM hypervisor abstraction layer
+- Allow overriding instance parameters in tool for inter-cluster
+  instance moves (``tools/move-instance``)
+- Improved opcode summaries (e.g. in ``gnt-job list``)
+- Improve consistency of OS listing by sorting it
+- Documentation updates
+
+
+Version 2.2.0.1
+---------------
+
+*(Released Fri, 8 Oct 2010)*
+
+- Rebuild with a newer autotools version, to fix python 2.6 compatibility
+
+
 Version 2.2.0
 -------------
 

configure.ac

 # Configure script for Ganeti
 m4_define([gnt_version_major], [2])
 m4_define([gnt_version_minor], [2])
-m4_define([gnt_version_revision], [0])
-m4_define([gnt_version_suffix], [])
+m4_define([gnt_version_revision], [1])
+m4_define([gnt_version_suffix], [~rc0])
 m4_define([gnt_version_full],
           m4_format([%d.%d.%d%s],
                     gnt_version_major, gnt_version_minor,