Merge part of 'jc/pack' into 'next'
authorJunio C Hamano <junkio@cox.net>
Mon, 6 Mar 2006 01:05:08 +0000 (17:05 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 6 Mar 2006 01:05:08 +0000 (17:05 -0800)

Trivial merge