commit b530ed433bb70e2aa1c212ac4fd11ec243d2635e Merge: 1ebd861 7058d47 Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Fri Mar 11 14:15:35 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache