merge with russ 'master' branch

diff --cc src/codecs/Makefile.am
Simple merge

diff --cc src/codecs/root/cd_tr_module.h
Simple merge

diff --cc src/protocols/Makefile.am
index 0e9f1d8898ac8b7bf0701487a17d76e4afe6d241,28f48f6792ee92521e2bb1e5084d8200ed35e506..3638305ad45eea719aa37f065b155b1997b56a9a
--- 1/src/protocols/Makefile.am
--- 2/src/protocols/Makefile.am
+++ b/src/protocols/Makefile.am
@@@ -14,8 -14,8 +14,9 @@@ ipv4.h 
  ipv6.h \
  gre.h \
  layer.h \
 +layer.cc \
  mpls.h \
+ packet.h \
  protocol_ids.h \
  tcp.h \
  teredo.h \