[Bug 225803] Merge Review: glade2