commit 4548120aef48927b4591ac1d974705821e08fb02 Merge: 18956f2 18e520a Author: Paolo Bonzini <pbonzini at redhat.com> Date: Fri Apr 6 14:15:14 2012 +0200 join f16 and f17 histories ---