commit a20d6afad722d306b8f981bfecb53437cd685f5f Merge: ac1e367 1354bed Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Wed Jun 22 08:42:30 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache