commit b998711ca9b2565dc959d4652993951e3a7145b6 Merge: 01d9c22 41aa97b Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Thu Jun 30 08:32:15 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache