[certmaster: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/certmaster

[Seth Vidal]

commit e7c845aab7c6b8e33a4c0e8539c48a3b34a67911
Merge: 3ecddb4 83aaf58
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Mon May 9 15:50:11 2011 -0400

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/certmaster
    
    * 'master' of ssh://pkgs.fedoraproject.org/certmaster:
      - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
    
    Conflicts:
    	certmaster.spec

---