[Bug 557760] Merge Review: sabayon