commit a0ac5ac55dafb1d70501ab0a05164e62c3eb716c Merge: cf024ae 7f3b2a7 Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Wed Dec 14 10:52:14 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache