Merge part of 'sp/checkout'
authorJunio C Hamano <junkio@cox.net>
Sat, 4 Mar 2006 22:58:11 +0000 (14:58 -0800)
committerJunio C Hamano <junkio@cox.net>
Sat, 4 Mar 2006 22:58:11 +0000 (14:58 -0800)

Trivial merge