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

[Henrik Nordström]

commit 3116bb3c7bc93b184ed47b536e520e9f68af23a4
Merge: 81bb076 dfc56c9
Author: Henrik Nordstrom <henrik at henriknordstrom.net>
Date:   Tue Aug 24 21:28:08 2010 +0200

    Merge branch 'master' into f13

 .gitignore |    2 ++
 sources    |    4 ++--
 squid.spec |    5 ++++-
 3 files changed, 8 insertions(+), 3 deletions(-)
---