telepathy-qt: Merge branch 'optimize-qmap'

[Dario Freddi]

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

Author: Dario Freddi <dario.freddi at collabora.com>
Date:   Mon Jul  2 15:54:58 2012 +0200

Merge branch 'optimize-qmap'

Reviewed-by: George Kiagiadakis <george.kiagiadakis at collabora.com>

---