8bbc296 resolve conflict with pscan

Authored and Committed by spot 12 years ago
    resolve conflict with pscan
    
        
file modified
+11 -1