Code

Merge branch 'master' into next
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 Dec 2010 05:50:52 +0000 (21:50 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Dec 2010 05:50:52 +0000 (21:50 -0800)
* master:


Trivial merge