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

[Bernard Johnson]

commit 34521817d01f56ca0076554c25b2917e33c0a9ce
Merge: 697ccd2 995030b
Author: Bernard Johnson <bjohnson at symetrix.com>
Date:   Tue Sep 27 11:40:46 2011 -0600

    Merge branch 'master' into el6
    
    Conflicts:
    	polipo.init
    	polipo.nm
    	polipo.spec

 polipo.init     |   27 ++------
 polipo.nm       |    3 +-
 polipo.service  |   14 ++++
 polipo.spec     |  196 +++++++++++++++++++++++++++++++++++++++---------------
 polipo.tmpfiles |    1 +
 5 files changed, 164 insertions(+), 77 deletions(-)
---