commit a3de4de2b2c626d27215823e5b0980ce24b087f7 Merge: 2082636 f55819b Author: Paolo Bonzini <pbonzini at redhat.com> Date: Fri Apr 6 14:38:13 2012 +0200 join f16 and f17 histories ---