[Bug 225779] Merge Review: GConf2