Homestyx hydra

R1:01bb30f9051e

Merge branch 'flavortext'
Repository: R1 hydra
Commit Date: May 15 2011