8ecbeeb Sync with upstream master and fix #1052846

Authored and Committed by Siddhesh Poyarekar 10 years ago
    Sync with upstream master and fix #1052846
    
    - Sync with upstream master.
    - Fix infinite loop in ftell when writing wide char data (#1052846).
    
        
file added
+443
file modified
+10 -2
file modified
+1 -1