Fixed merge conflicts within hsniff.c
Merge branch 'integration' of ssh://helios/home/git/repositories/honeyd into integration