[koji/f13/master: 8/8] Merge branch 'master' into f13

[Dennis Gilmore]

commit 1e7f1e0f692a9f1f2de4c5044b34801823de4b39
Merge: fab9251 9645510
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Fri Dec 17 20:33:09 2010 -0600

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	koji.spec
    	sources

 .gitignore |    2 ++
 koji.spec  |   57 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
 sources    |    2 +-
 3 files changed, 56 insertions(+), 5 deletions(-)
---