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

[Luke Macken]

commit ad990968a98e1252204a9188da19c7a7a1745509
Merge: cac1450 e472f57
Author: Luke Macken <lmacken at redhat.com>
Date:   Mon Jan 10 15:19:55 2011 -0500

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	bodhi.spec
    	sources

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