From a04fd1ef30824cfe24e3cf43d1593f197a270bc9 Mon Sep 17 00:00:00 2001
From: Karen Tracey <kmtracey@gmail.com>
Date: Sat, 16 May 2009 19:01:51 +0000
Subject: [PATCH] [1.0.X] Updated blocked and merged metadata for svnmerge.py.

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