[MERGE stable-2.1 into devel-2.1]

[Guido Trotter]

commit 0ea5693c7f3aca8bec00a89a1ec5fbc5a6a239ad
Merge: 965b30f 462c9bc
Author: Guido Trotter <ultrot...@google.com>
Date:   Fri May 7 16:20:59 2010 +0200

    Merge branch 'stable-2.1' into devel-2.1

    * stable-2.1:
      Bump version for 2.1.2.1 release
      Update NEWS for Ganeti 2.1.2.1
      KVM: only export instance tags if present