cf6de3e Update to upstream 0.9.6 (#797179)

Authored and Committed by pfrields 12 years ago
    Update to upstream 0.9.6 (#797179)
    
        
file modified
+1 -0
file modified
+7 -3
file modified
+1 -1