commit 3718b46b864d9e2f4771f8642b3028c823bbd240 Merge: 3a8158a 7a77305 Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Fri Feb 11 08:28:12 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache