commit 993021b5632f9b0caefcacd206f43fbb7abaf0c0 Merge: e4a26ad 51ab1a7 Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Mon Jan 24 21:31:09 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache