7a45ee5 Update from upstream and some fixes

Authored and Committed by luya 15 years ago
    Update from upstream and some fixes
    
        
file modified
+1 -1
file modified
+10 -5
file modified
+1 -1