commit faf767b2c5799158318c3ea4fd5ee1a13fd5d52c Merge: 90ff618 b6ec427 Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Thu Feb 17 21:25:18 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache