[next] telepathy-glib: Merge branch 'master' into next and update to latest merged spec

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Fri May 11 14:28:04 2012 +0100

Merge branch 'master' into next and update to latest merged spec

Conflicts:
	telepathy-glib/connection-contact-list.c
	telepathy-glib/contact.c
	tests/dbus/contacts-slow-path.c

---