Merge branch 'maint' into ef/ipv4-connect-error-report

* maint: connect: correctly number ipv6 network adapter

Junio C Hamano committed Aug 1, 2011 at 10:49 UTC 9353e09afa21b24fa356f960300e1c0a1567aa72

No changes.