5ba961d add upstream patch for dprintf conflict

Authored and Committed by jjh 13 years ago
    add upstream patch for dprintf conflict
    
        
file modified
+7 -1