[next] telepathy-glib: Merge branch 'master' into next

[Simon McVittie]

Module: telepathy-glib
Branch: next
Commit: 3375a1c2fd5fb72935f4576c532f73f698dbbedc
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=3375a1c2fd5fb72935f4576c532f73f698dbbedc

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu May  3 15:24:46 2012 +0100

Merge branch 'master' into next

Conflicts:
	telepathy-glib/connection-manager.c

---