[Telepathy] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/cassidy/public_html/darcs/telepathy-gabble-olpc2-cassidy

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    remove the OLPC bundle as we don't use it

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    remove newline