Merge branch 'master' of

ssh://huica@chivas64dev.cm.sourcefire.com/nfs/home/rucombs/Snort++ into
fileclass2

Conflicts:
	src/file_api/file_mime_process.h

diff --cc src/service_inspectors/http_inspect/hi_main.cc
Simple merge

diff --cc src/service_inspectors/http_inspect/hi_ui_config.cc
Simple merge

diff --cc src/service_inspectors/http_inspect/hi_ui_config.h
index 6adc0d8a2d67cf8c8456eecb1e42c601ec046739,2e937f1a70d1b50b5696944e80d261acb6da3348..98ab8f15de3f7878f3600dedfa7a50b67eae97d1
--- 1/src/service_inspectors/http_inspect/hi_ui_config.h
--- 2/src/service_inspectors/http_inspect/hi_ui_config.h
+++ b/src/service_inspectors/http_inspect/hi_ui_config.h
@@@ -34,10 -34,8 +34,9 @@@
  #define HI_UI_CONFIG_H
  
  #include "hi_include.h"
- #include "hi_util_kmap.h"
  #include "sfrt/sfrt.h"
  #include "sfip/sf_ip.h"
 +#include "file_api/file_mime_process.h"
  #include "file_api/file_api.h"
  #include "decompress/file_decomp.h"
  #include "framework/bits.h"

diff --cc src/service_inspectors/http_inspect/http_inspect.cc
Simple merge