cea439b update from git to make build

Authored and Committed by airlied 11 years ago
    update from git to make build
    
        
file added
+38456
file modified
+8 -1