rewrite to track this change, and b) there have been other changes which
also need to be merged in.


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