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

Trivial merge