commit 2f535f8061ba7357c18da0f5f63af912563720be Merge: 0b4c694 78df00d Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Mon Jun 20 08:39:44 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache