commit a6d2df9e75e7dda1002499e73c4b5a7ef3b16ff3 Merge: 099c22c 9d176e5 Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Thu Jun 16 21:04:59 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache