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)
commit9306ee06aade757789e734c1a857d175c5d18de2
treef870691352bcf92e27d51285dd8444ed8927b9ba
parentce032c5f9e75a604f4fea49a18de23c6dd8b02fa
parentdfdcb558ecf93c0e09b8dab89cff4839e8c95e36
Merge branch 'master' into next

* master:
  Fix-up previous expr changes.