[1.0.X] Block r9643 (code removal) and r9646 (fix to code present only in...

[1.0.X] Block r9643 (code removal) and r9646 (fix to code present only in trunk) from svnmerge.py consideration.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9653 bcc190cf-cafb-0310-a4f2-bffc1f526a37