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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon Apr 30 19:57:06 2012 +0100

Merge branch 'master' into next

Conflicts:
	tests/dbus/account-channel-request.c
	tests/lib/simple-channel-dispatcher.c

---