commit 5c18212fb5613b98d2339b845722f3f7dfa296c6 Merge: 6736903 b831ef5 Author: Nathanael D. Noblet <nathanael at gnat.ca> Date: Thu Jan 5 12:32:55 2012 -0700 Merge branch 'master' of ssh://pkgs.fedoraproject.org/barry ---