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

[Luke Macken]

commit 367b0aa07ad4a29bf8915125f2931390edc3b2b5
Merge: e19fcb7 80533ca
Author: Luke Macken <lmacken at redhat.com>
Date:   Thu Mar 24 16:38:17 2011 -0400

    Merge branch 'master' into el5

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