commit 7a4538d0b4d3061d94fa0987227e0c98dbb4a40b Merge: b8ceaaa 446d522 Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Fri Apr 29 09:21:08 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache