Merge branch 'aw/git-p4-deletion' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 24 Nov 2010 20:46:14 +0000 (24 12:46 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Nov 2010 20:46:14 +0000 (24 12:46 -0800)
* aw/git-p4-deletion:
  Fix handling of git-p4 on deleted files


Trivial merge