[Telepathy] merge: telepathy-gabble-olpc+tubes

[Merge Monkey]

Merge to:

  telepathy-gabble-olpc+tubes

From:

  telepathy-gabble-olpc+tubes-daf

Changes:

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    resolve conflicts

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    OLPC properties: adapt bas64_encode call to revised interface

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    don't use AM_LDFLAGS for stuff which should be in *_LDADD
I wish there were an AM_LDADD.