commit 16d58afeeb41da5203c7793cdd09798364018217 Merge: 863c22b 6f7944c Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Wed Aug 31 15:18:03 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache