Code

Merge branch 'post1.5.1/p4'
authorJunio C Hamano <junkio@cox.net>
Wed, 4 Apr 2007 07:09:36 +0000 (00:09 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 4 Apr 2007 07:09:36 +0000 (00:09 -0700)
* post1.5.1/p4:
  Added correct Python path to the RPM specfile.
  Remove unused WITH_OWN_SUBPROCESS_PY from RPM spec
  Added git-p4 package to the list of git RPMs.
  Add the WITH_P4IMPORT knob to the Makefile.


Trivial merge