commit bd4d3401adefe9f37968b955fec23cad0a697107 Merge: 7813b33 84628ca Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Tue Nov 29 21:11:05 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache