3601dc
Merge commit 'refs/merge-requests/15' of git://gitorious.org/testautomation/t_functional into merge-requests/15 Conflicts: tests/p_tcpdump/tcpdump_test.sh