Merge branch 'master' of git@openflowswitch.org:/oftest
diff --git a/tests/testutils.py b/tests/testutils.py
index 7c14537..084f74d 100644
--- a/tests/testutils.py
+++ b/tests/testutils.py
@@ -474,7 +474,7 @@
and logger
@param pkt If not None, use this packet for ingress
@param wildcards For flow match entry
- @param dl_vlan If not -1, and pkt is not None, create a pkt w/ VLAN tag
+ @param dl_vlan If not -1, and pkt is None, create a pkt w/ VLAN tag
@param exp_pkt If not None, use this as the expected output pkt; els use pkt
@param action_list Additional actions to add to flow mod
@param check_expire Check for flow expiration message