Code

Sync with 1.7.0.2
authorJunio C Hamano <gitster@pobox.com>
Sun, 7 Mar 2010 19:09:47 +0000 (11:09 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 7 Mar 2010 19:09:47 +0000 (11:09 -0800)

Trivial merge