[qemu/f18] (2 commits) ...Merge ../master into f18

[Richard W.M. Jones]

Summary of changes:

  dbb388c... Fix RHBZ#853408 which causes libguestfs failure. (*)
  6ae593a... Merge ../master into f18

(*) This commit already existed in another branch; no separate mail sent