Code

Merge branch 'maint-1.7.4' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 26 May 2011 17:29:24 +0000 (10:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 May 2011 17:29:24 +0000 (10:29 -0700)
commit5a6d82d0865a616bf22b9bbc3baea1ad4bd4b21b
tree7ff9e5e77766fa3f0fae8cea269cb285939a19ef
parentd9ac3e41c37ea565d8227d942b4f468616c9813a
parentbac9c06ba093d9254cb2ab3eed074722a3e635a6
Merge branch 'maint-1.7.4' into maint

* maint-1.7.4: