From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 3 Jun 2010 07:18:25 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: take08~55^2~124^2~137
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1d827652d0e5346cac7365bf1ddbb7863d142047;p=thirdparty%2Fsquid.git

Merge from trunk
---

1d827652d0e5346cac7365bf1ddbb7863d142047