Merge branch 'master' into dynamic_routing

Conflicts:
	src/devices/bridge/wscript

diff --cc src/devices/bridge/wscript
index d833533f30ebe70a7c461f4034c6e482a856ec9b,31e958041dc860521fc1415c496206de0028a3d4..26d8ea2a51f2bc672da18fd3a279bddeca932991
--- 1/src/devices/bridge/wscript
--- 2/src/devices/bridge/wscript
+++ b/src/devices/bridge/wscript
@@@ -11,17 -13,14 +13,19 @@@ def build(bld)
          'model/bridge-port-net-device.cc',
          'model/bridge-channel.cc',
        'helper/moose-bridge-helper.cc',
-         'helper/bridge-helper.cc',
 +      'model/bpdu-header.cc',
 +      'model/configuration-bpdu-header.cc',
 +      'model/tcn-bpdu-header.cc',
 +      'model/rst-bpdu-header.cc',
+         'helper/ethernet-bridge-helper.cc',
          ]
      headers = bld.new_task_gen('ns3header')
      headers.module = 'bridge'
      headers.source = [
-       'model/bridge-state.h',
 +      'model/bpdu-header.h',
+       'model/ethernet-bridge-state.h',
+       'model/ethernet-bridge-port-net-device.h',
+       'model/ethernet-bridge-net-device.h',
        'model/moose-bridge-state.h',
          'model/moose-bridge-port-net-device.h',
        'model/moose-bridge-net-device.h',