From 8cc518a96432644596dba5167bacd694bbf7ab4a Mon Sep 17 00:00:00 2001
From: Karen Tracey <kmtracey@gmail.com>
Date: Tue, 16 Dec 2008 14:26:02 +0000
Subject: [PATCH] [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