0834545 Fix file conflict with rpm

Authored and Committed by dchen 15 years ago
    Fix file conflict with rpm
    
        
file added
+1
file modified
+13 -7