Patch contributed by msb@

TEST=unit test
BUG=none

Review url: http://codereview.chromium.org/213006


git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@26457 0039d316-1c4b-4281-b951-d872f2087c98