eb3e9f - Merge with upstream

Authored and Committed by dwalsh 12 years ago
    - Merge with upstream
    
        
file modified
+1 -0
file modified
+1579 -2309
file modified
+5 -2
file modified
+1 -1