resolve conflict
resolve conflict


20061113135917-c9803-8a45571f3aea1855b35a5987aa5c43b29437bd11.gz

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