642d87
Merge commit 'refs/merge-requests/48' of git://gitorious.org/testautomation/t_functional into merge-requests/48