[MERGE] Merge branch 'stable-2.13' into stable-2.14

['Petr Pudlak' via ganeti-devel]

commit 03989a644fa1a07843ae9428823fe5247c447464
Merge: bc20bbf b0b19c7
Author: Petr Pudlak <pud...@google.com>
Date:   Tue Jan 27 17:28:19 2015 +0100

    Merge branch 'stable-2.13' into stable-2.14
    
    * stable-2.12
      Always restart dnsmasq that serves the metad interfaces
    
    Signed-off-by: Petr Pudlak <pud...@google.com>