15e1d52 updated to the latest upstream, sync. with f8

Authored and Committed by stransky 16 years ago
    updated to the latest upstream, sync. with f8
    
        
file modified
+7 -0
file modified
+9 -3
file modified
+2 -2