Conflicts:
	setup.py
	software/drupal/settings.php.in
	software/drupal/software.cfg
	stack/lamp/buildout.cfg

should be part of f13f9c09.

Add IPv6 support to smtp auth in nginx.

because webrunner uses only one IPv4 local address.

This has to be opt-in only as maybe we don't want it.

If match parameter is defined, it will grep this instead of URL.