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

[Luke Macken]

commit f776cc6e7d30956bfe92d582b84802168acd4dd9
Merge: 4378633 44dd621
Author: Luke Macken <lmacken at redhat.com>
Date:   Fri Mar 11 10:35:32 2011 -0500

    Merge branch 'master' into f14

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