Re-open #310 for 2.1.4 - trunk checks out fine.

git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@5646 d4fa192b-c00b-0410-8231-f00ffab90ce4