Merge.
authorMike Gorse <mgorse@novell.com>
Fri, 30 Oct 2009 19:10:30 +0000 (15:10 -0400)
committerMike Gorse <mgorse@novell.com>
Fri, 30 Oct 2009 19:10:30 +0000 (15:10 -0400)
commitdf3d02b1fa397957dee7fee9411196c725bdc4c8
tree8a2f3e705692f8e6c1828c88606f3b3c47e106fd
parent8ff1bd582c6219eb29814e6d61471c06997cd3fb
Merge.
atk-adaptor/bridge.c