commit 98da247769fad4170084bbc3255d8b13741e5380 Merge: 7a869ab 72850fe Author: Paul Wouters <paul at xelerance.com> Date: Mon Jan 24 14:34:23 2011 -0500 Merge branch 'el5/master' of ssh://pkgs.fedoraproject.org/ldns into el5 Conflicts: ldns.spec ---