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

[Luke Macken]

commit 38ed0aeac9b3739bdd5ccb21016d1f73f688b780
Merge: 8005c2c 3c74f0e
Author: Luke Macken <lmacken at redhat.com>
Date:   Wed Nov 16 16:07:58 2011 -0500

    Merge branch 'master' into el5

 .gitignore |    1 +
 bodhi.spec |    5 ++++-
 sources    |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---