merge

src/node/net-device.cc

@@ -45,6 +45,8 @@ TypeId NetDevice::GetTypeId (void)
 }
 
 NetDevice::~NetDevice ()
-{}
+{
+  NS_LOG_FUNCTION_NOARGS ();
+}
 
 } // namespace ns3

src/node/node.cc

@@ -148,6 +148,7 @@ Node::GetNApplications (void) const
 void 
 Node::DoDispose()
 {
+  m_handlers.clear ();
   for (std::vector<Ptr<NetDevice> >::iterator i = m_devices.begin ();
        i != m_devices.end (); i++)
     {