Added workaround for setuptools/distribute mismatch
diff --git a/GettingStarted.wiki b/GettingStarted.wiki
index 2ce3b44..9bef6db 100644
--- a/GettingStarted.wiki
+++ b/GettingStarted.wiki
@@ -364,4 +364,23 @@
ImportError: <module 'setuptools.dist' from ...> has no 'check_packages' attribute
}}}
-If your bin/buildout fails with this error and you run bootstrap.py with python 2.5, try running it again with python2.6 instead.
\ No newline at end of file
+If your bin/buildout fails with this error and you run bootstrap.py with python 2.5, try running it again with python2.6 instead.
+
+== pkg_resources.VersionConflict: (setuptools 0.6c11 (/tmp/tmphryxjW/setuptools-0.6c11-py2.7.egg), Requirement.parse('setuptools>=0.7')) ==
+
+{{{
+$ python bootstrap.py
+Downloading http://pypi.python.org/packages/2.7/s/setuptools/setuptools-0.6c11-py2.7.egg
+Traceback (most recent call last):
+ File "bootstrap.py", line 258, in <module>
+ ws.require(requirement)
+ File "/tmp/tmphryxjW/setuptools-0.6c11-py2.7.egg/pkg_resources.py", line 666, in require
+ File "/tmp/tmphryxjW/setuptools-0.6c11-py2.7.egg/pkg_resources.py", line 569, in resolve
+pkg_resources.VersionConflict: (setuptools 0.6c11 (/tmp/tmphryxjW/setuptools-0.6c11-py2.7.egg), Requirement.parse('setuptools>=0.7'))
+}}}
+
+http://stackoverflow.com/questions/17586987/how-to-solve-pkg-resources-versionconflict-error-during-bin-python-bootstrap-py
+
+{{{
+python bootstrap.py -d -v 2.1.1
+}}}
\ No newline at end of file
