Resolve conflict: remove gabble_muc_factory_find_channel, again (thdarcs)
Resolve conflict: remove gabble_muc_factory_find_channel, again (thdarcs)


20070926152233-53eee-e7ccd4bc0783325087bf8860d4b4817cc5ac537e.gz

Ziemin/telepathy-gabble,mlundblad/telepathy-gabble,mlundblad/telepathy-gabble,community-ssu/telepathy-gabble,community-ssu/telepathy-gabble,jku/telepathy-gabble,jku/telepathy-gabble,Ziemin/telepathy-gabble,community-ssu/telepathy-gabble,jku/telepathy-gabble,Ziemin/telepathy-gabble,Ziemin/telepathy-gabble,mlundblad/telepathy-gabble,community-ssu/telepathy-gabble