Code

Merge branch 'master' into next ko-next
authorJunio C Hamano <gitster@pobox.com>
Mon, 31 Jan 2011 03:02:54 +0000 (19:02 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 31 Jan 2011 03:02:54 +0000 (19:02 -0800)
* master:
  Git 1.7.4


Trivial merge