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

[Xavier Claessens]

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

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Wed Jun  6 11:27:10 2012 +0200

Merge branch 'master' into next

Conflicts:
	telepathy-glib/automatic-proxy-factory.h
	telepathy-glib/basic-proxy-factory.h
	telepathy-glib/client-channel-factory.h
	telepathy-glib/introspection.am
	telepathy-glib/media-interfaces.h
	telepathy-glib/simple-client-factory.h
	telepathy-glib/svc-media-interfaces.h
	telepathy-glib/telepathy-glib.h
	telepathy-glib/text-mixin.h

---