Merge remote-tracking branch 'upstream/master' into zope4py2

component/unstable/kerberos/buildout.cfg

-[buildout]
-
-parts =
-    kerberos
-
-extends = 
-  ../../component/bison/buildout.cfg
-
-[kerberos-package]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-url = http://web.mit.edu/kerberos/dist/krb5/1.11/krb5-1.11.1-signed.tar
-md5sum = 76c6bed945c5771674357cfd4a08e3f5
-
-[kerberos]
-recipe = hexagonit.recipe.cmmi
-url = ${kerberos-package:location}/krb5-1.11.1.tar.gz
-configure-command = src/configure
-configure-options =
-    --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
-make-options = -j1
-environment =
-  PATH=${bison:location}/bin:%(PATH)s