From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 17 Jul 2010 15:44:48 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: take08~55^2~124^2~113
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=634b59ab18284a9c5dd51f083f68e6d0b301f6d2;p=thirdparty%2Fsquid.git

Merge from trunk
---

634b59ab18284a9c5dd51f083f68e6d0b301f6d2