commit 753fa8db37615955c5ef0e9813827def668287ed Merge: 396a272 3afc5b4 Author: Eric Smith <eric at brouhaha.com> Date: Sat Jan 21 22:45:38 2012 -0800 Merge branch 'master' of ssh://pkgs.fedoraproject.org/asl ---