Merge 1.5.0.5 in from 'maint'
authorJunio C Hamano <junkio@cox.net>
Sun, 18 Mar 2007 22:36:44 +0000 (15:36 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 18 Mar 2007 22:36:44 +0000 (15:36 -0700)
Trivial merge