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

[Xavier Claessens]

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

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Thu May 31 13:54:34 2012 +0200

Merge branch 'master' into next

Conflicts:
	telepathy-glib/automatic-client-factory.c
	telepathy-glib/client-factory.c

---