85474df Update with upstreamed patches

Authored and Committed by hno 12 years ago
    Update with upstreamed patches
    
        
file modified
+2 -0
file modified
+2 -0
file modified
+10 -8