Sync up with HEAD and correct syntax errors
Sync up with HEAD and correct syntax errors


20080717003701-e3707-ee22eafaf7987eef0521a59c9b90efb69317ab34.gz

TelepathyIM/telepathy-spec,freedesktop-unofficial-mirror/telepathy__telepathy-spec