Merge git://github.com/the-tcpdump-group/tcpdump

diff --cc CHANGES
index 84fac25781f1b4e5858deaeef070a6855e3fcb02,69e798d9ce80119a1513e36f86f8c9f2b4dcbf81..9eea2ed062f5d4e05c7b52f514a9b24205a86a7a
--- 1/CHANGES
--- 2/CHANGES
+++ b/CHANGES
@@@ -1,15 -1,8 +1,19 @@@
+ Thursday Nov. 20, 2014 [email protected]
+   Summary for 5.0.0 tcpdump release
++      DCCP: update Packet Types with RFC4340/IANA names
++
 +Friday Nov. 12, 2014 [email protected]
 +  Summary for 4.7.0 tcpdump release
 +        changes to hex printing of CDP packets        
        Fix PPI printing
        Radius: update Packet Type Codes and Attribute Types with RFC/IANA names
 -      DCCP: update Packet Types with RFC4340/IANA names
 +      Add a routine to print "text protocols", and add FTP/HTTP/SMTP/RTSP support.
 +      improvements to telnet printer, even if not -v
 +      omit length for bcp, print-tcp uses it
 +      formatting fixes for a bunch of protocols
 +      new bounds checks for a number of protocols
 +      split netflow 1,6, and 6 dissector up.
 +      added geneve dissector
  
  Tuesday  Sep.  2, 2014 [email protected]
    Summary for 4.6.2 tcpdump release