260a11 Merge branch 'master' of ssh://gitorious.org/testautomation/t_functional

Merged and Committed by Athmane Madjoudj 13 years ago