commit c7e17e082c6d6e39425b1457df5e5ba03e729b57 Merge: 1bc5ac7 88f8a36 Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Fri May 13 10:09:41 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache