4378633 Merge branch 'master' into f14

Merged and Committed by Luke Macken 13 years ago
    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	bodhi.spec
    	sources
    
        
file modified
+3 -0
file modified
+5 -2
file modified
+1 -1