f359f6c - rebase to upstream release

Authored and Committed by mebrown 16 years ago
    - rebase to upstream release
    
        
file modified
+15 -7
file modified
+1 -1