8293001 further patches merged upstream

Authored and Committed by mschwendt 14 years ago
    further patches merged upstream
    
        
file modified
+2 -2