c10ae94 - sync with upstream (#578925)

Authored and Committed by jnovy 14 years ago
    - sync with upstream (#578925)
    
        
file modified
+1 -1
file modified
+1 -1
file modified
+8 -4