Merge branch 'maint'

Junio C Hamano committed May 10, 2012 at 10:45 UTC 2c78c91db7fdcc836db869d05d8274c840a07742

No changes.