[koji/el5: 2/2] Merge branch 'master' into el5

[Dennis Gilmore]

commit 5cae59abd05ae77954437c3d4967fdd819222761
Merge: 3ff7b61 5d6eaf5
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Tue Jun 5 15:36:31 2012 -0500

    Merge branch 'master' into el5

 fedora-config.patch |    2 +-
 koji.spec           |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---