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

[Gary Poster]

Log message for revision 109099:
  propagate merge from trunk from gary-1

Changed:
  _U  zc.buildout/branches/gary-2/
  U   zc.buildout/branches/gary-2/README.txt
  U   zc.buildout/branches/gary-2/bootstrap/bootstrap.py
  U   zc.buildout/branches/gary-2/src/zc/buildout/easy_install.py
  U   zc.buildout/branches/gary-2/src/zc/buildout/testing.py
  U   zc.buildout/branches/gary-2/src/zc/buildout/tests.py
  U   zc.buildout/branches/gary-2/zc.recipe.egg_/src/zc/recipe/egg/README.txt
  U   zc.buildout/branches/gary-2/zc.recipe.egg_/src/zc/recipe/egg/api.txt
  U   zc.buildout/branches/gary-2/zc.recipe.egg_/src/zc/recipe/egg/custom.txt
  U   zc.buildout/branches/gary-2/zc.recipe.egg_/src/zc/recipe/egg/selecting-python.txt
  U   zc.buildout/branches/gary-2/zc.recipe.egg_/src/zc/recipe/egg/tests.py

-=-

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

Added: svk:merge
   + 62d5b8a3-27da-0310-9561-8e5933582275:/zc.buildout/branches/gary-1:109098