[1.0.X] Fixed #9411 -- Changed the test from r9081 to be more robust across...

[1.0.X] Fixed #9411 -- Changed the test from r9081 to be more robust across different database backends. 

Backport of [9254] from trunk (I neglected to mention in the ticket this affected 1.0.X branch).

Also updated svnmerge metadata; all eligible fixes have been backported and all others blocked.


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