Merge branch 'master' into lldpmed

diff --cc CHANGELOG
index 6b1aba3e161c5c1dab275a2f6df200ccfa78fb39,7d407ad618754d75b891753ed8cba99f89df53a9..50aacb3d6d1e34d7724e394b1b2c8f7a34d44852
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -1,7 -1,9 +1,9 @@@
  lldpd (0.3)
  
 -  * Initial support of LLDP-MED (inventory part)
 +  * Initial support of LLDP-MED
    * Fix for bridge detection (don't send bridge ioctl on random interfaces)
+   * For bonded devices, get the real hardware address. For inactive
+     slaves, transmit using a random MAC address.
  
   -- Vincent Bernat <bernat@luffy.cx>
  

diff --cc src/lldpctl.c
Simple merge

diff --cc src/lldpd.c
Simple merge

diff --cc src/lldpd.h
Simple merge

diff --cc src/priv.c
Simple merge