Merge branch 'maint' to sync with 1.5.2.1
commit8009533070638490603eee06e1622f3e5aa3bfb2
authorJunio C Hamano <junkio@cox.net>
Sun, 3 Jun 2007 02:36:20 +0000 (2 19:36 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 3 Jun 2007 03:01:47 +0000 (2 20:01 -0700)
tree44bdaa4d1f10ac8a91a898bc5e8c8e2d740c688a
parent556df5e9c4ddbc481d7a25aef63ee41d9b1b6215
parent41cf68a85ca2a9199b32eb3932582b234fa474b4
Merge branch 'maint' to sync with 1.5.2.1