trunk: merge [7441] via svnmerge from 0.11-stable (Windows `cp0` no-encoding fix).
Authored by: osimons 2008-08-05
Parent: [r7441]
Child: [r7443]