commit 5f954d2c401bbc85e95c2c54bed2d89cc4bf4f64 Merge: 14a0992 3d973f5 Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Fri May 13 07:50:45 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache