[polipo/el6: 24/26] Merge branch 'master' into el6

[Bernard Johnson]

commit 4053e6f81841a7f75e8bc8c459a52b1075d5eb80
Merge: 3452181 3ee24a0
Author: Bernard Johnson <bjohnson at symetrix.com>
Date:   Sun Jan 22 19:30:47 2012 -0700

    Merge branch 'master' into el6

 http-assertion-failure.patch |  213 ++++++++++++++++++++++++++++++++++++++++++
 polipo.cron                  |   21 ++++
 polipo.spec                  |   21 +++-
 3 files changed, 250 insertions(+), 5 deletions(-)
---