commit 2b4744555f48c7314f4aaaf42a1749c09e9acdef Merge: 6e4e013 e9e02a4 Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Mon Oct 31 14:22:10 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache