am ed009be9: (-s ours) DO NOT MERGE. Merge commit \'4602bf9d\' into mergeit
Jeff Sharkey [Fri, 8 Mar 2013 19:04:20 +0000 (11:04 -0800)]
* commit 'ed009be9799ddfe554745c8aeb8f2ad47a10945b':
  Fix large file download failure issue


Trivial merge