Merge branch 'stable-2.9' into stable-2.10

['Hrvoje Ribicic' via ganeti-devel]

commit 258547eddbaca05fe3b81c99cfdc89d53d775344
Merge: 21698e4 b9566a2
Author: Hrvoje Ribicic <r...@google.com>
Date:   Tue Jun 3 15:49:18 2014 +0000

    Merge branch 'stable-2.9' into stable-2.10

    * stable-2.9
      (no changes)

    * stable-2.8:
      Fix QA patching functionality

    Signed-off-by: Hrvoje Ribicic <r...@google.com>