[empathy: 2/2] Merge remote branch 'zdra/configure'

[Guillaume Desmottes <gdesmott src gnome org>]

commit 4a8508f3b3a0c595add6908188a9a3e9c46c509a
Merge: 2a549bd 8d93b86
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Mon Nov 15 14:14:08 2010 +0100

    Merge remote branch 'zdra/configure'

 configure.ac                       |   13 ++++---------
 libempathy-gtk/Makefile.am         |    6 +-----
 nautilus-sendto-plugin/Makefile.am |    3 +--
 src/Makefile.am                    |    6 ------
 tests/Makefile.am                  |    2 --
 tests/interactive/Makefile.am      |    2 --
 6 files changed, 6 insertions(+), 26 deletions(-)
---