Fix merge conflicts -- there's no OBJECT_TRANSCODED.
Fix merge conflicts -- there's no OBJECT_TRANSCODED.

darcs-hash:20041008180323-4cc09-416eb00eeae320afceb7fa232182466d1b08475b.gz

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