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

[Luke Macken]

commit 05d048a1b8471c221683763e62bf6555bd080cef
Merge: 247f9ae 44dd621
Author: Luke Macken <lmacken at redhat.com>
Date:   Fri Mar 11 10:34:56 2011 -0500

    Merge branch 'master' into el6

 .gitignore |    4 ++++
 bodhi.spec |   17 ++++++++++++++++-
 sources    |    2 +-
 3 files changed, 21 insertions(+), 2 deletions(-)
---