[squid/f13/master: 2/2] Merge branch 'master' into f13

[Henrik Nordström]

commit 3afd83e5b87b58cea94581c258386633dbc8b8e6
Merge: 775a2b4 bdc58c2
Author: Henrik Nordstrom <henrik at henriknordstrom.net>
Date:   Sun Sep 5 19:04:40 2010 +0200

    Merge branch 'master' into f13

 .gitignore |    2 ++
 sources    |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)
---