Code

Merge branch 'master' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 22 Dec 2010 22:41:43 +0000 (14:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Dec 2010 22:41:43 +0000 (14:41 -0800)
* master:


Trivial merge