Merge part of 'sp/checkout'
authorJunio C Hamano <junkio@cox.net>
Sat, 4 Mar 2006 08:32:25 +0000 (00:32 -0800)
committerJunio C Hamano <junkio@cox.net>
Sat, 4 Mar 2006 08:32:25 +0000 (00:32 -0800)

Trivial merge