Homestyx hydra

R1:b029cb8b4ac7

Merge branch 'opacity'
Repository: R1 hydra
Commit Date: Apr 14 2011