Merge branch 'gr/cvsimport-alternative-cvspass-location' into maint

* gr/cvsimport-alternative-cvspass-location: Look for password in both CVS and CVSNT password files.

Junio C Hamano committed May 13, 2011 at 10:44 UTC 978471dccec18daab3165c60a90ad59cbdb43723

No changes.