Merge branch 'stable-2.10' into stable-2.11

['Helga Velroyen' via ganeti-devel]

commit 3e0b1ee816443e369c0bea04eba6cf645980ee65
Merge: 2dd83be 9179f38
Author: Helga Velroyen <hel...@google.com>
Date:   Thu Jun 12 09:31:41 2014 +0200

    Merge 'stable-2.10' into stable-2.11

* stable-2.10
  Check for SSL encoding inconsistencies

Signed-off-by: Helga Velroyen <hel...@google.com>