b8e8d20 Update to 6

Authored and Committed by oget 12 years ago
    Update to 6
    Drop upstreamed patch
    
        
file modified
+1 -0
file modified
+1 -1
file modified
+15 -10