Fix for ISSUE 9

The waldo file was pron using previously defined record index from the
last processed unified2 file

Thanks to github user aval13
Merge pull request #10 from binf/SpoolerWaldoFix-v2-1.10-beta2

Fixes issue firnsy/#9
Fixes for the Bro output plugin.

- Update event/record names for identifiers that Bro uses in its
  Barnyard2 integration scripts.
- Fix ICMP type/code byte ordering.
- Fix segfault when an alert has no classification.
- Fix for Broccoli expecting 64-bit count values.
- Support for IPv6 addresses (needs Bro > v2.0).
Merge pull request #25 from jsiwek/bro-output-fixes

Fixes for the Bro output plugin.
Merge branch 'master' of github.mandiant.com:OpenSource/barnyard2

Conflicts:
	src/spooler.c