From 9c5eafe7d550f8c1b2eec81c7837458411620a8b Mon Sep 17 00:00:00 2001
From: Karen Tracey <kmtracey@gmail.com>
Date: Sun, 8 Mar 2009 04:12:56 +0000
Subject: [PATCH] [1.0.X] Block new function (and fixes to same) from
 snvmerge.py consideration.

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