[soc2009/http-wsgi-improvements] Merged up to r11318 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/http-wsgi-improvements@11321 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Author: ccahoon

AUTHORS

@@ -14,6 +14,7 @@ The PRIMARY AUTHORS are (and/or have been):
     * Robert Wittams
     * Gary Wilson
     * Brian Rosner
+    * Justin Bronn
     * Karen Tracey
 
 More information on the main contributors to Django can be found in
@@ -201,6 +202,7 @@ answer newbie questions, and generally made Django that much better:
     Ian Holsman <http://feh.holsman.net/>
     Kieran Holland <http://www.kieranholland.com>
     Sung-Jin Hong <[email protected]>
+    Leo "hylje" Honkanen <[email protected]>
     Richard House <[email protected]>
     Robert Rock Howard <http://djangomojo.com/>
     John Huddleston <[email protected]>
@@ -219,7 +221,7 @@ answer newbie questions, and generally made Django that much better:
     Michael Josephson <http://www.sdjournal.com/>
     [email protected]
     [email protected]
-    Antti Kaihola <http://akaihola.blogspot.com/>
+    Antti Kaihola <http://djangopeople.net/akaihola/>
     Bahadır Kandemir <[email protected]>
     Karderio <[email protected]>
     Nagy Károly <[email protected]>

django/__init__.py

@@ -1,4 +1,4 @@
-VERSION = (1, 1, 0, 'beta', 1)
+VERSION = (1, 1, 0, 'rc', 1)
 
 def get_version():
     version = '%s.%s' % (VERSION[0], VERSION[1])