a98c8d2 - rebase to upstream master - revert API changes for F12 for now.

Authored and Committed by airlied 14 years ago
    - rebase to upstream master - revert API changes for F12 for now.
    
        
file modified
+2 -1
file modified
+2 -1
file modified
+32 -8