From 2ffeea20130c41091bd69748dca1c9c5a3dd9c8c Mon Sep 17 00:00:00 2001
From: Karen Tracey <kmtracey@gmail.com>
Date: Sat, 17 Jan 2009 22:36: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@9771 bcc190cf-cafb-0310-a4f2-bffc1f526a37