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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon May  7 17:08:44 2012 +0100

Merge branch 'master' into next

Conflicts:
	telepathy-glib/base-connection.c
	telepathy-glib/base-connection.h

---