From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 27 May 2010 01:31:51 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: take08~55^2~124^2~138
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4228b17a43ffb027940c2f950965d1574d1d52b5;p=thirdparty%2Fsquid.git

Merge from trunk
---

4228b17a43ffb027940c2f950965d1574d1d52b5