Merge to: telepathy-gabble From: telepathy-gabble-misc Changes: Dafydd Harries <dafydd.harries at collabora.co.uk> compilability