90f4006 readd a "merged upstream" patch comment

Authored and Committed by mschwendt 14 years ago
    readd a "merged upstream" patch comment
    
        
file modified
+1 -1