Merged r6042 from trunk.
scm: mercurial: fix unit adapter annotate test fails on Windows Mercurial 1.8.4+29-e597ef52a7c2.
Authored by: tmaruyama 2011-06-10
Parent: [r6045]
Child: [r6047]
