commit 0393086a6a2b82a0abf025136cca32c884c59584 Merge: bfde25a 8850b65 Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Tue Mar 29 09:18:38 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache