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

[Dennis Gilmore]

commit 3ff7b6138c84edc31a32ba8793a1a10338755937
Merge: 2e25c76 bd91f98
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Fri Jun 1 11:07:06 2012 -0500

    Merge branch 'master' into el5

 .gitignore          |    1 +
 fedora-config.patch |   12 ++++++------
 koji.spec           |   21 ++++++++++++++++-----
 sources             |    2 +-
 4 files changed, 24 insertions(+), 12 deletions(-)
---