commit 4213531e8043bf382f9070e0bd6fac2aa4c8d547 Merge: 3a08c3d 20732d8 Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Thu Sep 8 21:50:34 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache