merge from trunk

bootstrap/bootstrap.py

@@ -33,7 +33,7 @@ parser.add_option("-v", "--version", dest="version",
                           help="use a specific zc.buildout version")
 parser.add_option("-d", "--distribute",
                    action="store_true", dest="distribute", default=False,
-                   help="Use Disribute rather than Setuptools.")
+                   help="Use Distribute rather than Setuptools.")
 
 parser.add_option("-c", None, action="store", dest="config_file",
                    help=("Specify the path to the buildout configuration "