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

Conflicts:
	tools/snort2lua/rule_states/rule_content.cc

diff --cc src/codecs/ip/cd_icmp4.cc
Simple merge

diff --cc src/framework/codec.h
Simple merge

diff --cc tools/snort2lua/rule_states/rule_content.cc
index 9a2de3fd23b7a72ff5cf4354f2c46205b6695e6b,22539cab5f0a5bce3e8c4fab1581aced71cdc1e1..fda20612ba890d8c28cb92043015419b703536c8
--- 1/tools/snort2lua/rule_states/rule_content.cc
--- 2/tools/snort2lua/rule_states/rule_content.cc
+++ b/tools/snort2lua/rule_states/rule_content.cc
@@@ -128,17 -128,15 +128,16 @@@ bool Content<option_name>::parse_option
      else if (!keyword.compare("fast_pattern"))
      {
          if (val.empty())
 +        {
               rule_api.add_suboption("fast_pattern");
-         }
-         else if(!val.compare("only"))
 -
++              }
+         else if (!val.compare("only"))
          {
 -            static bool printed = false;
 -            if (!printed)
 +            static bool not_printed = true;
- 
-             if (not_printed)
++            if ( not_printed )
              {
 -                printed = true;
                  rule_api.add_comment("content's 'only' option has been deleted");
 +                not_printed = false;
              }
          }
          else