Merged r4683 from trunk (test:scm:setup:mercurial task can be simpler).
Authored by: tmaruyama 2011-01-11
Parent: [r4684]
Child: [r4686]