865a0fe Rebase to latest upstream release

Authored and Committed by jcm 15 years ago
    Rebase to latest upstream release
    
        
file modified
+2 -2
file modified
+12 -6
file modified
+2 -2