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