Merged r4644 and r4674 from trunk (mercurial unit app test).
Authored by: tmaruyama 2011-01-09
Parent: [r4674]
Child: [r4676]