Merge branch 'master' into p2p
authorMike Gorse <mgorse@novell.com>
Thu, 7 Oct 2010 14:41:38 +0000 (16:41 +0200)
committerMike Gorse <mgorse@novell.com>
Thu, 7 Oct 2010 14:41:38 +0000 (16:41 +0200)
commit0e86eaf1b77ba2e557c6b17201fbeefda5e92ad2
tree85b82480d874b372dbb4e0121897374f1a6e9519
parent1bd04d0eba893ad35019f151da08df85e13e7297
parent747254496ecabd11e84615295ef629959f8ad9d6
Merge branch 'master' into p2p

Conflicts:
configure.ac
atk-adaptor/bridge.c
atk-adaptor/bridge.h
atk-adaptor/event.c