gis: Merged revisions 4786-5490 via svnmerge from http://code.djangoproject.com/svn/django/trunk
native