Merge early parts of branch 'ls/am'
authorJunio C Hamano <junkio@cox.net>
Mon, 19 Jun 2006 05:13:11 +0000 (22:13 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 19 Jun 2006 05:13:11 +0000 (22:13 -0700)

Trivial merge