commit 4a3eb9546408d3ee582ed876dbb3bb2313b51b6a Merge: 5be59e0 d4a3ac0 Author: Stephen Gordon <sgordon at redhat.com> Date: Fri Jul 4 10:59:37 2014 -0400 Merge branch 'master' of ssh://pkgs.fedoraproject.org/aqemu Conflicts: aqemu-0.8.2-format-security.patch ---