fae5965 Merge branch 'master' into el5

Merged and Committed by lersek 11 years ago
    Merge branch 'master' into el5
    
    Conflicts:
    	lbzip2-makefile.patch
    	lbzip2.spec
    
        
file modified
+4 -0
file removed
-15
file removed
-48
file modified
+43 -47
file modified
+1 -1