Merge branch 'master' into next
authorJunio C Hamano <junkio@cox.net>
Tue, 23 May 2006 23:31:05 +0000 (16:31 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 23 May 2006 23:31:05 +0000 (16:31 -0700)
* master:
  cvsimport: do not barf on creation of an empty file.


Trivial merge