[MERGE] devel-2.7 into master

[Michael Hanselmann]

commit 6be4649 (HEAD, master)
Merge: d8784f7 bc0fed4
Author: Michael Hanselmann <han...@google.com>
Date:   Fri Jan 25 15:13:47 2013 +0100

    Merge branch 'devel-2.7'
    
    * devel-2.7:
      kvm: fix bug while fetching -device list