Homestyx hydra

R1:b91508c045aa

Fix a second minor merge issue

Auditors: chad, btrahan
Repository: R1 hydra
Commit Date: Sep 10 2013