commit 3c8e5203ebd7ad232c80406511d4288a41a6fc87 Merge: 8aa9494 e89cffc Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Thu Mar 31 16:58:28 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache