Code

Merge branch 'master' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 23:04:16 +0000 (15:04 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 23:04:16 +0000 (15:04 -0800)
* master:


Trivial merge