Fix #811: IPv6 address field support (patch from http://code.djangoproject.com/ticket/811)
Fix #7907: Tables argument of QuerySet.extra should allow subqueries.
Fix #9209: ModelChoiceField fails when passed a non-integer string.

Patch modified from http://code.djangoproject.com/ticket/9209 -
9209.diff (3.9 kB) - added by kmtracey on 11/05/08 19:25:38.
Fixed #16409 -- Fixed an error condition when using QuerySet only()/defer() on the result of an annotate() call. Thanks jaklaassen AT gmail DOT com and Tai Lee for the reports and Tai for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16522 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Conflicts:
	tests/regressiontests/defer_regress/tests.py
Fixed #11559 -- Fixed the URL resolver to be able to handle captured parameters in parent URLconfs when also using namespaces. Thanks, cwb, ungenio and hvdklauw.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16608 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Conflicts:
	django/core/urlresolvers.py
Import django.core.urlresolvers.reverse a little bit later.

This fixes our url mangling when permalinks are used - it's a slight
hack, but won't break anything. This can be reverted if we do it
the slightly harder but "right" way using an explicit mangling
method.
Allow post save redirects to be callable.
Support filtering by non-database (queryset) fields in the admin.
Fix for static admin validation with non-database field filters
Test fixes for non-unique emails.
Fixed issue with default manager handling saving.
For some reason _default_manager was returning the manager set with objects = ... in the model definition
Changed that around so ModelAdmin class now uses queryset() only to get all objects
Also changed base.py such that the objects are looked for through QuerySet(self.__class__) rather than _default_manager
Fix more authentication tests with regards to unique emails and password reset confirmation links.
make it possible to override statically served admin media files via settings option
stop git from deleting things it shouldnt
Make interpolate JS function not require the named parameter.

It is completely unnecessary and annoying to have to specify an additional parameter in Javascript
when using a dictionary to fill in the strings. Switching back and forth between python and js, this
can be often times forgotton, with bad results.

With this fix, compatibility is maintained with all current utilizations.
add request as an argument to the request_started signal
allow temporarily changing cache key prefixes
Modification to allow "__" as a gettext alias
Make sure bcc stays hidden
Allow for specifying multiple locales and domains for makemessages and compilemessages commands