Merge branch 'call'

diff --cc configure.ac
index 3e998de911d7132a52110012d4f27e0774168a00,fbe42221cccaf094607e53825c747a306810c895..a8a272be188d325a0d9420760594b02f759e076d
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -554,9 -563,8 +592,9 @@@ Configure summary
        Spell checking (enchant)....:  ${have_enchant}
        Display maps (libchamplain).:  ${have_libchamplain}
        Location awareness (Geoclue):  ${have_geoclue}
 +      Geocode support (Geoclue):     ${have_geocode}
        Adium themes (Webkit).......:  ${have_webkit}
-       Meego widgets ..............:  ${have_meego}
+       Meego widgets...............:  ${have_meego}
        Control center embedding....:  ${have_control_center_embedding}
        Cheese webcam support ......:  ${have_cheese}
  

diff --cc libempathy-gtk/Makefile.am
Simple merge

diff --cc libempathy/Makefile.am
index 41cec88fde3f3735de79b740d9b6bc0ffa465f64,186f08aa9981200eba90731bb2d5631cd4fe8bb4..48846311f0ea756323ee397128f3207cfa7fe211
--- 1/libempathy/Makefile.am
--- 2/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@@ -10,8 -10,8 +10,9 @@@ AM_CPPFLAGS 
        -DG_LOG_DOMAIN=\"empathy\"                      \
        -DGCR_API_SUBJECT_TO_CHANGE                     \
        $(EMPATHY_CFLAGS)                               \
+       $(YELL_CFLAGS)                                  \
        $(GEOCLUE_CFLAGS)                               \
 +      $(GEOCODE_CFLAGS)                               \
        $(NETWORK_MANAGER_CFLAGS)                       \
        $(CONNMAN_CFLAGS)                               \
        $(WARN_CFLAGS)                                  \

diff --cc libempathy/empathy-contact.c
Simple merge