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

[Luke Macken]

commit 1d12d22d7d250a7b5c8c039ceec38fd420c400c3
Merge: 05d048a 997d605
Author: Luke Macken <lmacken at redhat.com>
Date:   Mon Oct 24 17:52:41 2011 -0400

    Merge branch 'master' into el6

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