fix merge issue

Signed-off-by: Armin Kuster <akuster@mvista.com>
wireshark: adding wireshark.

place holder to save work

Signed-off-by: Armin Kuster <akuster@mvista.com>
wireshark: compile works

Signed-off-by: Armin Kuster <akuster@mvista.com>