Merge remote-tracking branch 'awilliam/tags/qemu-1.4-vfio-20130109.0' into staging