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