Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Sun, 20 Apr 2008 22:51:57 +0000 (15:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 20 Apr 2008 22:51:57 +0000 (15:51 -0700)
* maint:
  GIT 1.5.5.1


Trivial merge