Merge branch 'stable-2.12' into stable-2.13

['Klaus Aehlig' via ganeti-devel]

commit ddebd545ef7678ec5a8d7354c2a553fa43694dee
Merge: b0b19c7 3402b0f
Author: Klaus Aehlig <aeh...@google.com>
Date:   Fri Feb 6 11:40:33 2015 +0100

    Merge branch 'stable-2.12' into stable-2.13
    
    * stable-2.12
      Retry on more network errors
    
    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