Merge branch 'codecs' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/jrosenba/codecs...

diff --cc doc/config_changes.txt
index fe19d26dc8d4ac37368201c16f85b8944c337a60,fe19d26dc8d4ac37368201c16f85b8944c337a60..27d12711b5d2eb772390cb2ac065d071778f37ae
--- 1/doc/config_changes.txt
--- 2/doc/config_changes.txt
+++ b/doc/config_changes.txt
@@@ -83,6 -83,6 +83,7 @@@ change -> dynamicpreprocessor ==> 'snor
  change -> dynamicsidechannel ==> 'snort.--plugin_path=<path>'
  change -> event_filter: 'gen_id' ==> 'gid'
  change -> event_filter: 'sig_id' ==> 'sid'
++change -> event_filter: 'threshold' ==> 'event_filter'
  change -> file: 'config file: file_block_timeout' ==> 'block_timeout'
  change -> file: 'config file: file_lookup_timeout' ==> 'lookup_timeout'
  change -> file: 'config file: file_signature_depth' ==> 'signature_depth'