[1.1.X] Updated svnmerge metadata to reflect trunk changesets that have been...

[1.1.X] Updated svnmerge metadata to reflect trunk changesets that have been and should not be applied to 1.1.X.



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