[Bug 226498] New: Merge Review: tomboy