commit 0bd7eac85fb15249201040da7920a60dae0e4a37 Merge: bd96665 4a3eb95 Author: Stephen Gordon <sgordon at redhat.com> Date: Fri Jul 4 11:46:13 2014 -0400 Merge branch 'master' of ssh://pkgs.fedoraproject.org/aqemu Conflicts: aqemu-0.8.2-format-security.patch ---