[next] telepathy-glib: Merge remote-tracking branch 'origin/master' into next

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Apr 25 15:25:54 2012 +0100

Merge remote-tracking branch 'origin/master' into next

Conflicts:
	configure.ac
	docs/reference/telepathy-glib-sections.txt
	telepathy-glib/Makefile.am
	telepathy-glib/base-contact-list.c
	telepathy-glib/debug-sender.c
	tests/lib/contacts-conn.c

---