From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon, 10 Aug 2009 15:03:18 +0000 (+0100)
Subject: Merge commit 'ksz/rfb'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=61d13bbf3bf40d196ed727c6b79205ca0aaa94ff

Merge commit 'ksz/rfb'
---

61d13bbf3bf40d196ed727c6b79205ca0aaa94ff