commit 6c290ee38a280d5c9726ce1b7e10006122429e22 Merge: dd74a96 3ef111c Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Thu Nov 10 13:53:04 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache