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


Trivial merge