From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Thu, 17 Apr 2008 20:29:47 +0000 (-0600)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_1_0_1~45^2~11^2~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7a57da359e3a990287cd9db017b9ecf6c0023ef;p=thirdparty%2Fsquid.git

Merge from trunk
---

b7a57da359e3a990287cd9db017b9ecf6c0023ef