commit 07beaa0b7acdc0486c9b6be02465990d8b9e4051 Merge: 0fa3e51 4548120 Author: Paolo Bonzini <pbonzini at redhat.com> Date: Fri Apr 6 14:17:42 2012 +0200 join f17 and rawhide histories ---