commit f55819b6ba8bc25e60930b993a79a442fa60a92b Merge: 66f7090 47ed691 Author: Paolo Bonzini <pbonzini at redhat.com> Date: Fri Apr 6 14:28:31 2012 +0200 join f15 and f16 histories ---