Index: /main/kofacustom.sampleuni/trunk/bootstrap.py
===================================================================
--- /main/kofacustom.sampleuni/trunk/bootstrap.py	(revision 11857)
+++ /main/kofacustom.sampleuni/trunk/bootstrap.py	(revision 11858)
@@ -19,5 +19,9 @@
 """
 
-import os, shutil, sys, tempfile
+import os
+import shutil
+import sys
+import tempfile
+
 from optparse import OptionParser
 
@@ -32,6 +36,6 @@
 Python that you want bin/buildout to use.
 
-Note that by using --setup-source and --download-base to point to
-local resources, you can keep this script from going over the network.
+Note that by using --find-links to point to local resources, you can keep 
+this script from going over the network.
 '''
 
@@ -49,8 +53,8 @@
                         "even if they are alphas or betas."))
 parser.add_option("-c", "--config-file",
-                   help=("Specify the path to the buildout configuration "
-                         "file to be used."))
+                  help=("Specify the path to the buildout configuration "
+                        "file to be used."))
 parser.add_option("-f", "--find-links",
-                   help=("Specify a URL to search for buildout releases"))
+                  help=("Specify a URL to search for buildout releases"))
 
 
@@ -62,5 +66,6 @@
 to_reload = False
 try:
-    import pkg_resources, setuptools
+    import pkg_resources
+    import setuptools
     if not hasattr(pkg_resources, '_distribute'):
         to_reload = True
@@ -74,5 +79,6 @@
         from urllib2 import urlopen
 
-    exec(urlopen('http://python-distribute.org/distribute_setup.py').read(), ez)
+    exec(urlopen(
+        'http://downloads.buildout.org/2.1/distribute_setup.py').read(), ez)
     setup_args = dict(to_dir=tmpeggs, download_delay=0, no_fake=True)
     ez['use_setuptools'](**setup_args)
@@ -90,5 +96,5 @@
 # Install buildout
 
-ws  = pkg_resources.working_set
+ws = pkg_resources.working_set
 
 cmd = [sys.executable, '-c',
@@ -114,4 +120,5 @@
     import setuptools.package_index
     _final_parts = '*final-', '*final'
+
     def _final_version(parsed_version):
         for part in parsed_version:
