commit 6038894bb8e1863b81e3fe2798e79923a79eb0cf Merge: c95acca f2b1e0a Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Wed Mar 9 12:21:37 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache