a0fab99 rebase to snapshot of git master (no UMS code)

Authored and Committed by airlied 11 years ago
    rebase to snapshot of git master (no UMS code)
    
        
file modified
+1 -0
file removed
-21
file modified
+1 -1
file modified
+8 -7