add62fb Merge commit '834a7c34f60be65b1ebf87935f41ed74eea8f4bf' into el5

Merged and Committed by salimma 13 years ago
    Merge commit '834a7c34f60be65b1ebf87935f41ed74eea8f4bf' into el5
    
    Conflicts:
    	bti.spec
    
        
file modified
+4 -2