Merge branch 'stable-2.2' into devel-2.2
authorMichael Hanselmann <hansmi@google.com>
Wed, 22 Sep 2010 14:33:34 +0000 (16:33 +0200)
committerMichael Hanselmann <hansmi@google.com>
Wed, 22 Sep 2010 14:53:11 +0000 (16:53 +0200)
commit227e546fb58ddf3b267c3a2b3b2d7ec1bdecc5d6
tree54f39b9631c2c93770fd786e0faadca0dc82463d
parentcb639800782ceabca388887aee32c57bce8c122a
parentf64de30f003a76ac9bad0fc720c47ec7271a9c95
Merge branch 'stable-2.2' into devel-2.2

* stable-2.2:
  NEWS: Add 2.2.0~rc2 release date
  Bump version to 2.2.0~rc2
  Remove two old aliases
  Fix migration on new KVMs
  Prepare 2.2.0~rc2 release

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: RenĂ© Nussbaumer <rn@google.com>
NEWS