345c4e4 - pull in more fixes from master

Authored and Committed by airlied 15 years ago
    - pull in more fixes from master
    
        
file modified
+620 -78
file modified
+114 -982
file modified
+4 -1