2f6b618 - fix collision with copy fb contents patch

Authored and Committed by airlied 15 years ago
    - fix collision with copy fb contents patch
    
        
file modified
+2 -7
file modified
+4 -1