Fix merge conflicts -- forbidden on the client side.
Fix merge conflicts -- forbidden on the client side.

darcs-hash:20041008173127-4cc09-eea9af2120b2a3fe8de7e44232357d3855c6b107.gz

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