From 71ae6cbfa46a82ae1a79f382ac31fe0c11ea8677 Mon Sep 17 00:00:00 2001
From: Karen Tracey <kmtracey@gmail.com>
Date: Fri, 24 Oct 2008 16:39:28 +0000
Subject: [PATCH] [1.0.X] block [9248] (feature) and [9263] (updated
 translation) from svnmerge consideration.

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