From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 27 Jun 2010 11:34:40 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: take08~55^2~124^2~126
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e377827070266b44ca44c3a3f435334f5a8b9ebf;p=thirdparty%2Fsquid.git

Merge from trunk
---

e377827070266b44ca44c3a3f435334f5a8b9ebf