merge conflicts from daf's namespace badgering
merge conflicts from daf's namespace badgering


20060509002538-0e791-149c6a9f8867da277da4b62ff185246b4a520e3b.gz

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