[1.1.X] Update svnmerge metadata to reflect what has been backported and what...

[1.1.X] Update svnmerge metadata to reflect what has been backported and what should not be backported to 1.1.X.


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