commit 194d664e2308d3caca6f465d99aef0638fa0ce36 Merge: 8a385bf 701e5c3 Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Thu Sep 22 14:57:11 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache