commit 54ddaece7bee30b46ff12d00177c060edf21833b Merge: 0197fd4 74f9b69 Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Wed Jan 26 10:48:51 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache