Merge git://kvm.qumranet.com/home/avi/kvm