Merge branch 'master' into next
authorJunio C Hamano <junkio@cox.net>
Fri, 14 Apr 2006 02:05:51 +0000 (19:05 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 14 Apr 2006 02:05:51 +0000 (19:05 -0700)
* master:
  Fix-up previous expr changes.


Trivial merge