Merge branch 'maint'
authorJunio C Hamano <junkio@cox.net>
Fri, 16 Feb 2007 01:13:15 +0000 (17:13 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 16 Feb 2007 01:13:15 +0000 (17:13 -0800)
* maint:
  pretend-sha1: grave bugfix.


Trivial merge