commit 2e3b5a5d3256f2f917019bd3b8c4253c0e0a0d1f Merge: 4fac23d e01527c Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Wed Mar 30 09:35:38 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache