Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Sun, 17 Feb 2008 09:16:44 +0000 (01:16 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 17 Feb 2008 09:16:44 +0000 (01:16 -0800)
* maint:
  GIT 1.5.4.2


Trivial merge