Merge branch 'stable-2.10' into stable-2.11

['Hrvoje Ribicic' via ganeti-devel]

commit ef11ec261b65fe4fccbc61c8268eee10f8a78ba4
Merge: 0c9204b 4f6727a
Author: Hrvoje Ribicic <r...@google.com>
Date:   Tue Jun 3 16:00:15 2014 +0000

    Merge branch 'stable-2.10' into stable-2.11

    * 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>