From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Thu, 4 Mar 2010 01:05:50 +0000 (-0700)
Subject: Merged from parent (trunk r10303).
X-Git-Tag: SQUID_3_2_0_1~93^2~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0b807c28451739a64972b954baa87dc1490a904;p=thirdparty%2Fsquid.git

Merged from parent (trunk r10303).
---

f0b807c28451739a64972b954baa87dc1490a904