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

[Henrik Nordström]

commit 775a2b4e01ae450446d29dc5e516d44da3685a5d
Merge: a8970f8 eee43d6
Author: Henrik Nordstrom <henrik at henriknordstrom.net>
Date:   Sun Sep 5 18:50:50 2010 +0200

    Merge branch 'master' into f13

 squid-3.1.0.15-smb-path.patch |   16 ++++++++--------
 squid.spec                    |    5 ++++-
 2 files changed, 12 insertions(+), 9 deletions(-)
---