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

[Luke Macken]

commit 9113bac59bcf97a44f24ecb56fdfb41a163e44cf
Merge: 1d12d22 3c74f0e
Author: Luke Macken <lmacken at redhat.com>
Date:   Wed Nov 16 16:07:49 2011 -0500

    Merge branch 'master' into el6

 .gitignore |    1 +
 bodhi.spec |    5 ++++-
 sources    |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---