[Bug 225989] Merge Review: libbonobo