commit e0e6a40ddf5278bc4f35746badd7df528f3613a8 Merge: 00ed039 bd903e8 Author: Paolo Bonzini <pbonzini at redhat.com> Date: Fri Nov 16 13:46:28 2012 +0100 Merge branch 'master' into el6 ---