commit ecb5d30c7ba6fd4a743d6230de96cc730746c4fd Merge: 4b43218 73add51 Author: James Findley <sixy at gmx.com> Date: Wed Aug 4 11:41:13 2010 +0100 Merge branch 'el5/master' of ssh://pkgs.fedoraproject.org/mrepo into el5/master ---