[empathy: 2/2] Merge remote branch 'vminko/fix-609942'

[Guillaume Desmottes <gdesmott src gnome org>]

commit dff6d4ec7292db208dac8abf44a238764b1e3915
Merge: b776688 6f6c118
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Tue Nov 2 10:05:28 2010 +0100

    Merge remote branch 'vminko/fix-609942'

 libempathy-gtk/empathy-string-parser.c |   12 ++++++------
 tests/empathy-parser-test.c            |    6 +++++-
 2 files changed, 11 insertions(+), 7 deletions(-)
---