4f4c7b6 Bumped to upstream, corrected patches to accomodate.

Authored and Committed by limb 16 years ago
    Bumped to upstream, corrected patches to accomodate.
    
        
file modified
+1 -1
file modified
+7 -6
file modified
+1 -1
file modified
+61 -38