Merge branch 'master' of master.kernel.org:git/Meta/
authorJunio C Hamano <junkio@cox.net>
Wed, 28 Dec 2005 02:21:09 +0000 (18:21 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 28 Dec 2005 02:21:09 +0000 (18:21 -0800)

Trivial merge