[Telepathy] merge: telepathy-python

[Merge Monkey]

Merge to:

  telepathy-python

From:

  /home/smcv/public_html/darcs/telepathy-python-smcv

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Don't include tools/*.py, tools/*.def in MANIFEST (there aren't any)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Remove no-longer-used files from tools/

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Update to Telepathy spec 0.15.2

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    message.py: wait longer for message to be sent