[MERGE] devel-2.7 into master

[Michael Hanselmann]

commit c311056 (HEAD, master)
Merge: effc9ca 4b8b172
Author: Michael Hanselmann <han...@google.com>
Date:   Fri Jan 25 11:12:30 2013 +0100

    Merge branch 'devel-2.7'
    
    * devel-2.7:
      hv_xen: Remove config after shutdown was successful

--