Fix merge conflicts.
Fix merge conflicts.

darcs-hash:20050919190811-4cc09-1b7d196ecac1cfda7e582e188af71b6d266f3c8c.gz

fukusaka/polipo,feijilei/polipo,gorakhargosh/polipo,lkraider/polipo,jech/polipo,ajmgh/polipo,feijilei/polipo,doublec/namecoin-polipo,clowwindy/polipo,fqtools/polipo,galeksandrp/polipo,berkley4/polipo,akkakks/polipo,jech/polipo,akkakks/polipo,Android-Apps/polipo,toke/polipo,nxtreaming/chumen,lkraider/polipo,dxq-git/polipo,Android-Apps/polipo,fqtools/polipo,strongwillow/polipo,feijilei/polipo,caeies/polipo-caeies,lkraider/polipo,berkley4/polipo,strongwillow/polipo,nxtreaming/chumen,fqtools/polipo,akkakks/polipo,dxq-git/polipo,berkley4/polipo,Psiphon-Inc/polipo,jech/polipo,ssb22/polipo2,TierraDelFuego/opilop,galeksandrp/polipo,ssb22/polipo2,ssb22/polipo2,dxq-git/polipo,nxtreaming/chumen,danchr/polipo,jeromelebel/polipo,galeksandrp/polipo