Homestyx hydra

R1:c6ca409a035e

Minor, fix more merge failures.
Repository: R1 hydra
Commit Date: Dec 7 2012