From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Sat, 5 Apr 2008 04:54:38 +0000 (-0600)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_1_0_1~49^2~302^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0ac901b6d41f32289eb05afeef77573dc519bfd6;p=thirdparty%2Fsquid.git

Merge from trunk
---

0ac901b6d41f32289eb05afeef77573dc519bfd6