fix conflict with HEAD
fix conflict with HEAD


20070824110920-7fe3f-fc0ecea6627525eef6b82650c2b540cc0a791a12.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