From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Tue, 30 Sep 2008 17:19:29 +0000 (-0600)
Subject: Merged from trunk.
X-Git-Tag: SQUID_3_1_0_1~45^2~11^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0aae1b84a7237a14d69fbf58e8cc80d56ab094d5;p=thirdparty%2Fsquid.git

Merged from trunk.
These were eCAP,p2-inspired changes that were committed separately.
---

0aae1b84a7237a14d69fbf58e8cc80d56ab094d5