[Bug 226498] Merge Review: tomboy