From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 13 May 2010 06:48:36 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: take08~55^2~124^2~151
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=45bffb55beb05a671478c5bf8313cfacb61593bb;p=thirdparty%2Fsquid.git

Merge from trunk
---

45bffb55beb05a671478c5bf8313cfacb61593bb