f3f94ef Merge branch 'el5' into el4

Merged and Committed by stevetraylen 13 years ago
    Merge branch 'el5' into el4
    
    Conflicts:
    	.gitignore
    	sources
    	torque.spec
    
        
file modified
+3 -1
file modified
+1 -1
file modified
+4 -1