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)
commitcb7e3aefa6d6a55530d729e068275beae8a4e2f7
treef49344ea8519de118822add749322ba32a1fa641
parent95655d79ad13697e0d68e986d3b0b402efad007a
parentfaced1af7112353bcb67e033cd2a4fb47e21b201
Merge branch 'post1.5.1/p4'

* 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.