Merge maint in
authorJunio C Hamano <gitster@pobox.com>
Wed, 2 Jul 2008 00:19:34 +0000 (17:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 2 Jul 2008 00:19:34 +0000 (17:19 -0700)
commit951b09ce363f503d7bbd9dfa01b5a3ea2623c3d8
tree66a359823e566656dd84f43e464c967e71c53fd7
parent5e707b28d9ea0bebfef5aff977e3ccebd53aa045
parent7ad0f27b925463c5ca6908573ed24ede11a9981f
Merge maint in