Index: django/bin/compile-messages.py
===================================================================
--- django/bin/compile-messages.py	(revision 6426)
+++ django/bin/compile-messages.py	(working copy)
@@ -14,7 +14,10 @@
     basedirs = [os.path.join('conf', 'locale'), 'locale']
     if os.environ.get('DJANGO_SETTINGS_MODULE'):
         from django.conf import settings
-        basedirs += settings.LOCALE_PATHS
+        try:
+            basedirs += settings.LOCALE_PATHS
+        except:
+            pass
 
     # Gather existing directories.
     basedirs = set(map(os.path.abspath, filter(os.path.isdir, basedirs)))
Index: AUTHORS
===================================================================
--- AUTHORS	(revision 6426)
+++ AUTHORS	(working copy)
@@ -311,7 +311,7 @@
     Vlado <vlado@labath.org>
     Milton Waddams
     wam-djangobug@wamber.net
-    wangchun <yaohua2000@gmail.com>
+    Wang Chun <wangchun@exoweb.net>
     Filip Wasilewski <filip.wasilewski@gmail.com>
     Dan Watson <http://theidioteque.net/>
     Chris Wesseling <Chris.Wesseling@cwi.nl>