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

[Bernard Johnson]

commit 14f156570674a3f29b62fca226e2470b95cf397b
Merge: 4053e6f 4eef7d8
Author: Bernard Johnson <bjohnson at symetrix.com>
Date:   Sun Jan 22 19:33:39 2012 -0700

    Merge branch 'master' into el6

 polipo.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---