Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Mar 2010 22:56:13 +0000 (14:56 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Mar 2010 22:56:13 +0000 (14:56 -0800)
* maint:
  Start preparing for 1.7.0.2

Conflicts:
RelNotes


Trivial merge