commit ff1165c59237dc18f3771e45a3d397110daffc8e Merge: 49308a9 44f47f0 Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Thu Feb 24 09:18:38 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache