Merge branch 'squid-v3' into intranator-next
authorGerd von Egidy <gerd.von.egidy@intra2net.com>
Tue, 12 May 2009 15:42:12 +0000 (17:42 +0200)
committerGerd von Egidy <gerd.von.egidy@intra2net.com>
Tue, 12 May 2009 15:42:12 +0000 (17:42 +0200)

Trivial merge