Merge in trunk @r2248-2267 to the branch because I missed
it the last time I merged.

TBR=evan


git-svn-id: svn://svn.chromium.org/chrome/trunk@2451 0039d316-1c4b-4281-b951-d872f2087c98
tree: 5ea60baf6d11d21a6e893d92e9fee624dac03564
  1. depot_tools/
  2. deps/
  3. src/