9c4e9e8 rebase to upstream release

Authored and Committed by Matt Domsch 14 years ago
    rebase to upstream release
    
        
file modified
+58 -49
file modified
+1 -1