resolve conflicts
resolve conflicts


20061127175729-c9803-835547aad95d6da681639b8e433d9d55f70cff26.gz

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