Merge branch 'stable-2.3' into devel-2.3

* stable-2.3:
  Bump version for 2.3.1~rc1 release

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>

NEWS

 News
 ====
 
+Version 2.3.1 rc1
+-----------------
+
+*(Released Wed, 1 Dec 2010)*
+
+- impexpd: Disable OpenSSL compression in socat if possible (backport
+  from master, commit e90739d625b, see :doc:`installation guide
+  <install-quick>` for details)
+- Changed unittest coverage report to exclude test scripts
+- Added script to check version format
+
+
 Version 2.3.0
 -------------
 

configure.ac

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