Merge early part of branch 'jc/fetchupload'
authorJunio C Hamano <junkio@cox.net>
Sun, 18 Jun 2006 00:57:33 +0000 (17:57 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 18 Jun 2006 00:57:33 +0000 (17:57 -0700)

Trivial merge