fb431d4 - More /usr move fixes

Authored and Committed by mgrepl 12 years ago
    - More /usr move fixes
    
        
file modified
+558 -180
file modified
+4 -1