commit e9e9c4e6acb763e1294d0c4aedb1b0712d144357 Merge: ce64cea 2a8ecb4 Author: Paul Wouters <paul at nohats.ca> Date: Tue May 1 20:26:00 2012 -0400 Merge branch 'f17' of ssh://pkgs.fedoraproject.org/validns into f17 Conflicts: .gitignore sources validns.spec ---