Merge part of 'sp/checkout' into next
authorJunio C Hamano <junkio@cox.net>
Wed, 1 Mar 2006 09:35:51 +0000 (01:35 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 1 Mar 2006 09:35:51 +0000 (01:35 -0800)

Trivial merge