commit 69e59af21e03867ca4c92aa8a29bfb41383401b4 Merge: a641a46 28e866b Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Thu Oct 13 09:56:51 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache