Merge branch 'maint'

* maint: Prepare for 1.7.6.1 am: refresh the index at start and --resolved Conflicts: GIT-VERSION-GEN RelNotes

Junio C Hamano committed Aug 16, 2011 at 14:22 UTC 50b68aeb392537a730a86349293acf046a778b74

No changes.