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

[Henrik Nordström]

commit a8970f82a3a431b5f53f635ab04c07ca0597ca30
Merge: 3116bb3 39d5b85
Author: Henrik Nordstrom <henrik at henriknordstrom.net>
Date:   Fri Sep 3 11:20:09 2010 +0200

    Merge branch 'master' into f13

 squid.spec |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)
---