make test failure with latest master

[A Large Angry SCM <gitzilla@gmail.com>]

[Resent due to incorrect list address.]

With the latest master, 2221a6757161af1905925c405aded9ff470f70d5, "make 
test" now fails; last successful "make test" was mid-week sometime with 
master d25430. This is on a laptop running Suse 9.3.


*** t9600-cvsimport.sh ***
*   ok 1: setup cvsroot
*   ok 2: setup a cvs module
* FAIL 3: import a trivial module


                 git cvsimport -a -z 0 -C module-git module &&
                 git diff module-cvs/o_fortuna module-git/o_fortuna


*   ok 4: pack refs
*   ok 5: update cvs module
* FAIL 6: update git module


                 cd module-git &&
                 git cvsimport -a -z 0 module &&
                 git merge origin &&
                 cd .. &&
                 git diff module-cvs/o_fortuna module-git/o_fortuna


*   ok 7: update cvs module
* FAIL 8: cvsimport.module config works


                 cd module-git &&
                         git config cvsimport.module module &&
                         git cvsimport -a -z0 &&
                         git merge origin &&
                 cd .. &&
                 git diff module-cvs/tick module-git/tick


* failed 3 among 8 test(s)