Code

Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 13 Apr 2011 20:59:19 +0000 (13:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 Apr 2011 20:59:19 +0000 (13:59 -0700)
commit6c4c9bdc981180e94b06ba3a29a59288601361a4
treed50a8eec64a6785ff37ef49210e539d9c5b1104c
parent0353a0c4ec91cf2d0a8e209025aa2e1909d05f19
parent06ff44951a233c2e3dee4f072430ac68306f9bf0
Merge branch 'maint'

* maint: