[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/smcv/public_html/darcs/gabble-smcv

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    servicetest: catch KeyboardInterrupt and treat as an error, even in Python 2.5

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    servicetest: catch SystemExit and use it to end the test (even in Python 2.4) - fixes test-google-roster on 2.4