[Checkins] SVN: zc.buildout/branches/gary-1/ merge from trunk

[Gary Poster]

Log message for revision 109098:
  merge from trunk

Changed:
  _U  zc.buildout/branches/gary-1/
  U   zc.buildout/branches/gary-1/bootstrap/bootstrap.py

-=-

Property changes on: zc.buildout/branches/gary-1
___________________________________________________________________
Added: svn:mergeinfo
   + /zc.buildout/trunk:108946

Added: svk:merge
   + 62d5b8a3-27da-0310-9561-8e5933582275:/zc.buildout/trunk:108946


Modified: zc.buildout/branches/gary-1/bootstrap/bootstrap.py
===================================================================
--- zc.buildout/branches/gary-1/bootstrap/bootstrap.py	2010-02-17 20:37:26 UTC (rev 109097)
+++ zc.buildout/branches/gary-1/bootstrap/bootstrap.py	2010-02-17 21:16:05 UTC (rev 109098)
@@ -33,7 +33,7 @@
                           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 "