Conflicts:
	varnish-cache/bin/varnishd/varnishd.1

git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@4107 d4fa192b-c00b-0410-8231-f00ffab90ce4