Not that this release really matters, as we will be doing
1.5.1 tomorrow.  This commit is to tie the loose ends and
merge all of "maint" branch into "master" in preparation.
Signed-off-by: NJunio C Hamano <junkio@cox.net>