b4fb146 - Actually fix file conflict with python-zope-filesystem.

Authored and Committed by konradm 14 years ago
    - Actually fix file conflict with python-zope-filesystem.
    
        
file modified
+5 -2