ff590f9 - fix fileconflicts in subpackages

Authored and Committed by karsten 17 years ago
1 file changed. 6 lines added. 7 lines removed.
    - fix fileconflicts in subpackages
    
        
file modified
+6 -7