c576539 Merge commit 'e1df7b0f128fb022cd7603688081d5a5d99aee99' into el5

Merged and Committed by stevetraylen 13 years ago
    Merge commit 'e1df7b0f128fb022cd7603688081d5a5d99aee99' into el5
    
    Conflicts:
    	python-inotify.spec
    	sources
    
        
file modified
+10 -6
file modified
+1 -1