2d7841
Merge commit 'refs/merge-requests/17' of git://gitorious.org/testautomation/t_functional into merge-requests/17