telepathy-qt: Merge branch 'cmake'

[Dario Freddi]

Module: telepathy-qt
Branch: master
Commit: c9d803117900e110bc4dd4c1c3b28499763d4a06
URL:    http://cgit.freedesktop.org/telepathy/telepathy-qt/commit/?id=c9d803117900e110bc4dd4c1c3b28499763d4a06

Author: Dario Freddi <dario.freddi at collabora.com>
Date:   Mon Jul  2 17:50:24 2012 +0200

Merge branch 'cmake'

Reviewed-by: Dario Freddi <dario.freddi at collabora.com>
Reviewed-by: George Kiagiadakis <george.kiagiadakis at collabora.com>

---