Fix gmerge tests to work again.
Fix gmerge tests to work again.

BUG=chromium-os:16062
TEST=Verify gmerge tests work again.

Change-Id: I2bee2e70de0e16e6236a61778c28c82461f0d0c0
Reviewed-on: http://gerrit.chromium.org/gerrit/1981
Reviewed-by: Sonny Rao <d867fc987a366be56684d1145622524a3ba1efbf@chromium.org>
Tested-by: David James <f231dc574bbeb62604660cbc162d1b8642a0a3af@chromium.org>

marineam/coreos-dev-util,coreos/dev-util,coreos/dev-util,marineam/coreos-dev-util,mgireesh05/dev-util,mgireesh05/dev-util,coreos/dev-util,mgireesh05/dev-util