546629
Merge commit 'refs/merge-requests/22' of git://gitorious.org/testautomation/t_functional into merge-requests/22 Conflicts: tests/p_lsof/10-test_lsof.sh