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

[Luke Macken]

commit 8aecb055135427cf141c3a9322bca3e311f0002a
Merge: 10602ba 44dd621
Author: Luke Macken <lmacken at redhat.com>
Date:   Fri Mar 11 10:35:48 2011 -0500

    Merge branch 'master' into f13

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