bug 840305 - timeout for hg clones. r=jgriffin
backing out e7e6e4dbcbe7 due to bustage.
Merge remote-tracking branch 'origin/master' into beagle