commit 50b7975c467ab82e6f2fc5b244c2fd0a7d7c4b8a Merge: 332c520 d223152 Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Mon Jun 6 08:35:12 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache