Resolve merge conflict.
Resolve merge conflict.

darcs-hash:20040910223355-4cc09-8745a134809444637c6b348624e1c75bc206ab31.gz

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