Merge branch 'master' into dynamic_routing

Conflicts:
	src/devices/bridge/wscript

diff --cc src/devices/bridge/wscript
index 3f1fe86b3adb5928ef8ffe8321cdc824e07063f9,110bd5f9d1ae0e739a211c7c0b73c241b7d73885..d833533f30ebe70a7c461f4034c6e482a856ec9b
--- 1/src/devices/bridge/wscript
--- 2/src/devices/bridge/wscript
+++ b/src/devices/bridge/wscript
@@@ -18,7 -16,8 +20,9 @@@ def build(bld)
      headers = bld.new_task_gen('ns3header')
      headers.module = 'bridge'
      headers.source = [
 +      'model/bpdu-header.h',
+       'model/bridge-state.h',
+       'model/moose-bridge-state.h',
          'model/moose-bridge-port-net-device.h',
        'model/moose-bridge-net-device.h',
          'model/bridge-net-device.h',