3e998e2 update to latest git snapshot

Authored and Committed by airlied 8 years ago
    update to latest git snapshot
    
        
file modified
+1 -0
file modified
+1 -1
file modified
+6 -3