Merge branch 'master' into next
authorJunio C Hamano <junkio@cox.net>
Tue, 6 Jun 2006 05:36:35 +0000 (22:36 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 6 Jun 2006 05:36:35 +0000 (22:36 -0700)
* master:
rev-parse: tighten constness properly.
A Perforce importer for git.

Trivial merge