Merge branch 'maint'

* maint:

Junio C Hamano committed Mar 20, 2012 at 15:54 UTC 498a04af143f55a7bbbba484d48a7f123d43be04

No changes.