[Telepathy-commits] merge: stream-engine-0.4

[Merge Monkey]

Merge to:

  stream-engine-0.4

From:

  /home/smcv/public_html/darcs/stream-engine-0.4-smcv

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Don't respond to NewMediaSessionHandler until GetSessionHandlers has returned, avoiding creating two sessions for the same handler if the timing is wrong

Backported from stream-engine HEAD, which has diverged enough that the patch
didn't apply here.