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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed May  2 16:47:00 2012 +0100

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

Conflicts:
	examples/client/inspect-contact.c

---