Conflicts:
	component/slapos/buildout.cfg

add numpy egg, as websockify (novnc core) requires it for new HyBi-10 WebSocket protocol (coming with Chrome 14 and Firefox 7)

This avoids generation of bin/buildout script, as the original one is just
good enough.

Need to allow from www.owlfish.com, as WSGIUtils is available there.

It is not required to have this option set into the stack.

According to the policy adopted this must be overridden by the
software developer.

The name should not be set directly.
It is much safer to have the prebuild egg name acquired from the proper
section.
 i.e. (${section-name:egg-name})

Once this is a development branch it is not required to have such
versions.

This section is not required, it doesn't change anything.

We should not use develop at that level. Because that should not be
published like that, if you want to use the option develop, it may be
used on the highest level of buildout.cfg file.

this option was making git unusable behind a proxy

This option must be used to set the trusted certificates which gonna be
used by slapos.libnetworkcache to filter the content retrived from shadir.
It accepts multiple lines.

Well, according to the developing done in:
  - https://git.erp5.org/gitweb/slapos.libnetworkcache.git/shortlog/refs/heads/signature?js=1

It is required to build M2Crypto, otherwise it is not possible to use
the signature feature provided by slapos.libnetworkcache.