commit 1305d5e81bcf8758daac97e8338bace7b74d99d8 Merge: 8e54b56 e224718 Author: Paolo Bonzini <pbonzini at redhat.com> Date: Fri Sep 14 11:46:27 2012 +0200 join (again) f16 and f17 histories ---