commit 03b56048dc7af6945715505e858d3b3c7caaffb9 Merge: f6a5e7e 18db545 Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Tue Mar 15 10:01:35 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache