Code

Merge branch 'master' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 19:26:21 +0000 (11:26 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 19:26:21 +0000 (11:26 -0800)
* master:


Trivial merge