Merge branch 'p2p'
authorMike Gorse <mgorse@novell.com>
Fri, 3 Dec 2010 20:47:48 +0000 (15:47 -0500)
committerMike Gorse <mgorse@novell.com>
Fri, 3 Dec 2010 20:47:48 +0000 (15:47 -0500)
commit3ca4f9b7ac013b9f00c1c9ee379ed803943a96fd
treea99cd0cddb5c19fdabf96b4c9692c0734de248ed
parent9180950a89a6fa1cf63cbee5c88ce18cd3d87c51
parent344deddcec79cb4611010a7c8655755f5d05350e
Merge branch 'p2p'

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