[qemu/f16] (2 commits) ...join (again) f15 and f16 histories

[bonzini]

Summary of changes:

  2dedc01... CVE-2011-1750 virtio-blk: heap buffer overflow (bz 698906,  (*)
  e224718... join (again) f15 and f16 histories

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