[bodhi/el5: 3/3] Merge branch 'master' into el5

[Luke Macken]

commit 8005c2c3b386d636f44ad28a62e0ee811ac23881
Merge: 367b0aa 997d605
Author: Luke Macken <lmacken at redhat.com>
Date:   Mon Oct 24 16:58:37 2011 -0400

    Merge branch 'master' into el5

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