bd51f1
Merge commit 'refs/merge-requests/24' of git://gitorious.org/testautomation/t_functional into merge-requests/24