Merge branch 'p2p'

Conflicts:
	atk-adaptor/bridge.c

diff --cc atk-adaptor/bridge.c
index 35086f4,398ebda..ce1ea51
--- 1/atk-adaptor/bridge.c
--- 2/atk-adaptor/bridge.c
+++ b/atk-adaptor/bridge.c
@@@ -757,6 -794,10 +794,8 @@@ adaptor_init (gint * argc, gchar ** arg
    else
      get_registered_event_listeners (spi_global_app_data);
  
 -  g_atexit (exit_func);
 -
+   setup_bus();
+ 
    return 0;
  }
  

diff --cc configure.ac
Simple merge