commit 1a5b7fd02cb7643934383cfbf6d276741e5158bc Merge: aa07de4 5e2c77b Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Mon May 23 07:19:54 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache