From 610aedacca739fc134cdc7f9e9cc8566e828ac10 Mon Sep 17 00:00:00 2001
From: Karen Tracey <kmtracey@gmail.com>
Date: Wed, 14 Jan 2009 15:33:07 +0000
Subject: [PATCH] [1.0.X] Block trunk new function commits from svnmerge.py
 consideration.

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