temporary destabilised head

I've temporarily destabilised HEAD with my bug564 merge.

I'm working on correcting that now, but can backout the change if
needed.

The primary reason for the change was to make clientStreams as it was
originally specced - the thing being that it was coded with the 'cbdata
for refcounting hack', when refcounting wasn't available for squid.

Rob

-- 
GPG key available at: <http://users.bigpond.net.au/robertc/keys.txt>.