[gsoc2009-testing] Massive merge update to trunk. This is to prep for upload

django/contrib/admin/options.py

...b/admin/templates/admin/delete_selected_confirmation.html

django/contrib/gis/management/commands/inspectdb.py

django/core/management/commands/inspectdb.py

django/db/backends/__init__.py

django/db/backends/oracle/base.py

django/db/backends/oracle/introspection.py

docs/conf.py

docs/howto/deployment/modpython.txt

docs/howto/deployment/modwsgi.txt

docs/index.txt

docs/internals/svn.txt

docs/ref/contrib/formtools/form-wizard.txt

docs/ref/databases.txt

docs/ref/forms/widgets.txt

tests/modeltests/expressions/models.py

tests/regressiontests/backends/tests.py

tests/regressiontests/introspection/tests.py

tests/regressiontests/queries/models.py