cleaned up repo, used the following script:

cleaned up repo, used the following script:

commit="089d0b2a52925af993a9acb1a92377c2511738cf";
revlist=`git-rev-list $commit.. | tac`
git reset --hard $commit
git reset --soft HEAD~1
git reset HEAD local_settings.py
git commit -m "added is_deleted etc"
for rev in $revlist
do
    git-cherry-pick $rev
done

derived from git-kill[http://kerneltrap.org/mailarchive/git/2007/1/31/237305]