commit b05baa63fd93afb94c315a185cbc38b4dee2e4ba Merge: 42654fd 0471b9b Author: Geoff Simmons <geoff at uplex.de> Date: Mon Jan 16 17:45:14 2012 +0100 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache into experimental-ims