Merge branch 'master' of ssh://alikins@git.fedoraproject.org/git/hosted/certmaster
authorAdrian Likins <alikins@redhat.com>
Fri, 5 Sep 2008 18:15:52 +0000 (14:15 -0400)
committerAdrian Likins <alikins@redhat.com>
Fri, 5 Sep 2008 18:15:52 +0000 (14:15 -0400)

Trivial merge