Merge branch 'stable-2.11' into stable-2.12

['Hrvoje Ribicic' via ganeti-devel]

commit 703bb3506e7c4d30f2041d1146e492118c62d9c9
Merge: 3bd2a4c d3584fc
Author: Hrvoje Ribicic <r...@google.com>
Date:   Wed Jun 4 11:14:18 2014 +0000

    Merge branch 'stable-2.11' into stable-2.12

    * stable-2.11
      (no changes)

    * stable-2.10
      (no changes)

    * stable-2.9
      (no changes)

    * stable-2.8:
      Fix QA patching functionality

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