[at-spi2-atk/p2p: 3/3] Merge branch 'master' into p2p

[Mike Gorse <mgorse src gnome org>]

commit 0e86eaf1b77ba2e557c6b17201fbeefda5e92ad2
Merge: 1bd04d0 7472544
Author: Mike Gorse <mgorse novell com>
Date:   Thu Oct 7 16:41:38 2010 +0200

    Merge branch 'master' into p2p
    
    Conflicts:
    	configure.ac

 NEWS                 |    4 ++++
 atk-adaptor/bridge.c |    1 +
 atk-adaptor/bridge.h |    1 +
 atk-adaptor/event.c  |    3 +++
 configure.ac         |    2 +-
 5 files changed, 10 insertions(+), 1 deletions(-)
---
diff --cc atk-adaptor/bridge.h
index 728b245,0c8b70d..1a3ebee
--- a/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;