9f13431 resolve conflict with perl-pmtools (bz 437612)

Authored and Committed by spot 16 years ago
1 file changed. 12 lines added. 7 lines removed.
    resolve conflict with perl-pmtools (bz 437612)
    
        
file modified
+12 -7