# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1253288271 -7200
# Node ID 1214c64c592b0bf6e6c65dbc4b981813055475c9
# Parent  c655432c2c241a0dc858049ee03f02cce8d565f9# Parent  661bc51f09b7deb85388d7d52f19b3a338829a23
Merge with crew-stable (again)

I had pulled 661bc51f09b7 into my local clone and accidentially
rebased it after pulling a new changeset from crew.

diff -r c655432c2c24 -r 1214c64c592b hgext/win32mbcs.py