Merge branch 'android-tcpdump-3.9.8' into tcpdump.org-update
authorMichael Richardson <mcr@sandelman.ca>
Mon, 17 Feb 2014 18:02:48 +0000 (13:02 -0500)
committerMichael Richardson <mcr@sandelman.ca>
Mon, 17 Feb 2014 18:02:48 +0000 (13:02 -0500)

Trivial merge