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

[Luke Macken]

commit 771ad1b2a733fe66b34d7af25f9d60022f8069be
Merge: bdb08fa 997d605
Author: Luke Macken <lmacken at redhat.com>
Date:   Mon Oct 24 17:03:19 2011 -0400

    Merge branch 'master' into f14

 .gitignore |    1 +
 bodhi.spec |   16 +++++++++++++---
 sources    |    2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)
---