resolve conflict with local autoconf versioning change
resolve conflict with local autoconf versioning change


20060829090054-25e70-e0989c7883d3cb5dd57980cf0af692185a225fad.gz

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