merge conflicts between Nokia Internet Call Invitation branch and trunk
merge conflicts between Nokia Internet Call Invitation branch and trunk


20070131192935-418b8-09bf14badd546e7d5454b0fd4d3fd6fc940c436e.gz

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