05bd40 - Upstream wanted some minor changes, upgrading to keep api the same

Authored and Committed by dwalsh 12 years ago
    - Upstream wanted some minor changes, upgrading to keep api the same
    - Upgrade to upstream
    #200110
    
        
file modified
+1 -0
file modified
+80 -0
file modified
+0 -1
file modified
+1 -1