Sync lib/telepathy-glib/Makefile.am with the conflicting branch of cmlib refactoring
Sync lib/telepathy-glib/Makefile.am with the conflicting branch of cmlib refactoring


20070205181622-53eee-e5b02f772a324e619aa7fd6836ed7c18e8f1560d.gz

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