From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 22 May 2010 06:35:57 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: take08~55^2~124^2~142
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0d6808fce8b7a9adbe8b852501c8b80e07bf6ee3;p=thirdparty%2Fsquid.git

Merge from trunk
---

0d6808fce8b7a9adbe8b852501c8b80e07bf6ee3