Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Sun, 2 Dec 2007 19:00:45 +0000 (11:00 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 2 Dec 2007 19:00:45 +0000 (11:00 -0800)
* maint:
  t9600: test cvsimport from CVS working tree


Trivial merge