afd6826 Update to today's git snapshot

Authored and Committed by kalev 10 years ago
    Update to today's git snapshot
    
    Upstream git commit a89ca82e6823641231adb90ad6c1e48c870d2c2f from the
    master branch.
    
        
file modified
+8 -3
file modified
+1 -1