Merge branch 'hold/rpm'
authorJunio C Hamano <junkio@cox.net>
Thu, 10 Nov 2005 02:44:18 +0000 (18:44 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 10 Nov 2005 02:44:18 +0000 (18:44 -0800)

Trivial merge