bd65e56 revert conflict so xen can still install

Authored and Committed by notting 16 years ago
    revert conflict so xen can still install
    
        
file modified
+3 -1