diff -r 37505d64e57b -r f2e327a7c5de thirdparty/google_appengine/appcfg.py
--- a/thirdparty/google_appengine/appcfg.py	Tue Sep 16 01:18:49 2008 +0000
+++ b/thirdparty/google_appengine/appcfg.py	Tue Sep 16 02:28:33 2008 +0000
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-"""Convenience wrapper for starting appcfg."""
+"""Convenience wrapper for starting an appengine tool."""
 
 
 import os
@@ -33,16 +33,23 @@
   sys.stderr.write('Warning: Python 2.4 is not supported; this program may '
                    'break. Please use version 2.5 or greater.\n')
 
-APPCFG_PATH = 'google/appengine/tools/appcfg.py'
-
 DIR_PATH = os.path.abspath(os.path.dirname(os.path.realpath(__file__)))
+SCRIPT_DIR = os.path.join(DIR_PATH, 'google', 'appengine', 'tools')
 
 EXTRA_PATHS = [
   DIR_PATH,
+  os.path.join(DIR_PATH, 'lib', 'django'),
+  os.path.join(DIR_PATH, 'lib', 'webob'),
   os.path.join(DIR_PATH, 'lib', 'yaml', 'lib'),
 ]
 
+SCRIPT_EXCEPTIONS = {
+  "dev_appserver.py" : "dev_appserver_main.py"
+}
+
 if __name__ == '__main__':
   sys.path = EXTRA_PATHS + sys.path
-  script_path = os.path.join(DIR_PATH, APPCFG_PATH)
+  script_name = os.path.basename(__file__)
+  script_name = SCRIPT_EXCEPTIONS.get(script_name, script_name)
+  script_path = os.path.join(SCRIPT_DIR, script_name)
   execfile(script_path, globals())