9122939 Sync with upstream.

Authored and Committed by jnovy 10 years ago
    Sync with upstream.
    
        
file modified
+48 -3
file modified
+245 -200
file modified
+12697 -7570
file modified
+6 -3
file modified
+3032 -744
file modified
+22 -22