2009-03-27 - production
17:43	<brion>	live-merging r48923 to make CURL timeout for upload-by-url configurable	[production]