2eacfee - sync with upstream because of #517806

Authored and Committed by jnovy 14 years ago
    - sync with upstream because of #517806
    
        
file modified
+1 -1
file modified
+1 -1
file modified
+5 -2