commit b4f1774d0fe2690d6768615b1ff0694c2fdfbd05 Merge: 89289cf e2287d2 Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Mon Feb 28 21:35:15 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache