Merged r4687 from trunk (fix setup mercurial test repository).
Authored by: tmaruyama 2011-01-11
Parent: [r4688]
Child: [r4690]