Merge branch 'fk/usage'
authorJunio C Hamano <junkio@cox.net>
Wed, 14 Dec 2005 21:01:01 +0000 (13:01 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 14 Dec 2005 21:01:01 +0000 (13:01 -0800)

Trivial merge