Merge branch 'stable-2.10' into stable-2.11

['Klaus Aehlig' via ganeti-devel]

commit 573b1a72e203513d4e6263843751fbb1315cacd3
Merge: 4b59c9a f12b935
Author: Klaus Aehlig <aeh...@google.com>
Date:   Thu Jan 22 15:37:18 2015 +0100

    Merge branch 'stable-2.10' into stable-2.11
    
    * stable-2.10
      Fix spacing
    
    Signed-off-by: Klaus Aehlig <aeh...@google.com>



-- 
Klaus Aehlig
Google Germany GmbH, Dienerstr. 12, 80331 Muenchen
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores