Merge branch 'master' into p2p

Conflicts:
	configure.ac

diff --cc atk-adaptor/bridge.c
Simple merge

diff --cc atk-adaptor/bridge.h
index 728b245,0c8b70d..1a3ebee
--- 1/atk-adaptor/bridge.h
--- 2/atk-adaptor/bridge.h
+++ b/atk-adaptor/bridge.h
@@@ -59,8 -56,8 +59,9 @@@ struct _SpiBridg
  */
    gchar *desktop_name;
    gchar *desktop_path;
 +char *app_bus_addr;
    GList *events;
+   gboolean events_initialized;
  };
  
  extern SpiBridge *spi_global_app_data;

diff --cc atk-adaptor/event.c
Simple merge