From 02b15e87d2901f5f98d4c37e428ca6ee4cebf601 Mon Sep 17 00:00:00 2001
From: Karen Tracey <kmtracey@gmail.com>
Date: Wed, 10 Dec 2008 15:39:15 +0000
Subject: [PATCH] [1.0.X] Blocked non-bugfix changesets from svnmerge.py
 consideration.

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