Merge branch 'bc/git-p4-for-python-2.4' into maint