From: Christos Tsantilas <chtsanti@users.sourceforge.net>
Date: Wed, 2 Feb 2011 17:55:24 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: take03^2~37^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2840077ede8965718a163527a5eeb38345205e41;p=thirdparty%2Fsquid.git

merge from trunk
---

2840077ede8965718a163527a5eeb38345205e41