[Bug 225237] Merge Review: acpid