600507 - rebase to latest upstream for vline fixes and zaphod fixes

Authored and Committed by airlied 10 years ago
    - rebase to latest upstream for vline fixes and zaphod fixes
    
        
file modified
+1 -1
file modified
+1 -1
file modified
+6 -5