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

[Dennis Gilmore]

commit ddfcc1324bb3d5db3e6e26d2fb3b3b8b906af947
Merge: cf3cf05 5d6eaf5
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Tue Jun 5 15:36:10 2012 -0500

    Merge branch 'master' into el6

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