59475c2 - Merge with upstream

Authored and Committed by dwalsh 13 years ago
    - Merge with upstream
    
        
file modified
+69 -55