fb7d64 - rebase to upstream 6.8.0 release + git fixes

Authored and Committed by airlied 12 years ago
    - rebase to upstream 6.8.0 release + git fixes
    
        
file modified
+6 -1