Merge branch 'stable-2.8' into stable-2.9

['Hrvoje Ribicic' via ganeti-devel]

commit 4df28f0c89cbad475ab29d7131a7d21353802710
Merge: 8f467ab 540f468
Author: Hrvoje Ribicic <r...@google.com>
Date:   Tue Jun 3 15:28:23 2014 +0000

    Merge branch 'stable-2.8' into stable-2.9

    * stable-2.8:
      Fix QA patching functionality

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