Merge branch 'master' of master.kernel.org:git/Meta/
authorJunio C Hamano <junkio@cox.net>
Tue, 27 Dec 2005 08:05:35 +0000 (00:05 -0800)
committerJunio C Hamano <junkio@cox.net>
Tue, 27 Dec 2005 08:05:35 +0000 (00:05 -0800)

Trivial merge