Merge branch 'stable-2.10' into stable-2.11

['Klaus Aehlig' via ganeti-devel]

commit 5f870f91c901e9afe6c27f04d44f4149a99d423b
Merge: 6c1c23c 8ba2f9e
Author: Klaus Aehlig <aeh...@google.com>
Date:   Wed Mar 4 17:00:37 2015 +0100

    Merge branch 'stable-2.10' into stable-2.11
    
    * stable-2.10
      Remove unused import
    
    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