ff73ce4 Merge branch 'master' into el6

Merged and Committed by toshio 13 years ago
    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	python-kitchen.spec
    	sources
    
        
file modified
+1 -1
file modified
+10 -5
file modified
+1 -1