resolve conflicts
resolve conflicts


20070622223147-b58c9-963623d9f374cead7fb1a5a86c8bf8b959ddab46.gz

freedesktop-unofficial-mirror/telepathy__telepathy-salut,freedesktop-unofficial-mirror/telepathy__telepathy-salut,freedesktop-unofficial-mirror/telepathy__telepathy-salut,freedesktop-unofficial-mirror/telepathy__telepathy-salut