[MERGE] Merge branch 'stable-2.11' into stable-2.12

['Petr Pudlak' via ganeti-devel]

commit f2845413edb554a0317a03e19968f40fbc47d8bf
Merge: 9b26779 ec0e320
Author: Petr Pudlak <pud...@google.com>
Date:   Fri Jul 11 11:49:06 2014 +0200

    Merge branch 'stable-2.11' into stable-2.12
    
    * stable-2.11
      Remove user-initiated shutdown design from drafts
      Improve startup/shutdown in the admin guide
      Improve user down documentation
    
    Signed-off-by: Petr Pudlak <pud...@google.com>