commit ca5fe96964088e3ff44df22ea678a7700ac3a762 Merge: 8f85e38 403a361 Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Wed Jun 22 11:00:50 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache