From 315fd2434c530ff4488e30e61a09c83e509ebf5a Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun, 22 Feb 2009 09:23:21 +0000
Subject: [PATCH] Added SVNmerge annotations for some revisions already merged,
 and some that need to be blocked.

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