--- a/src/contrib/wscript	Mon Mar 23 11:26:39 2009 -0700
+++ b/src/contrib/wscript	Mon Mar 23 11:35:47 2009 -0700
@@ -50,4 +50,7 @@
 
     if bld.env['ENABLE_LIBXML2']:
         module.source.append ('xml-config.cc')
-        module.uselib = module.uselib + ' LIBXML2'
+        if bld.env['ENABLE_GTK_CONFIG_STORE']:
+            module.uselib = module.uselib + ' LIBXML2'
+        else:
+            module.uselib = 'LIBXML2'

--- a/src/internet-stack/ipv4-l3-protocol.cc	Mon Mar 23 11:26:39 2009 -0700
+++ b/src/internet-stack/ipv4-l3-protocol.cc	Mon Mar 23 11:35:47 2009 -0700
@@ -161,6 +161,7 @@
       *i = 0;
     }
   m_interfaces.clear ();
+  m_routingProtocols.clear ();
   m_node = 0;
   m_staticRouting->Dispose ();
   m_staticRouting = 0;

--- a/src/internet-stack/udp-socket-impl.h	Mon Mar 23 11:26:39 2009 -0700
+++ b/src/internet-stack/udp-socket-impl.h	Mon Mar 23 11:35:47 2009 -0700
@@ -105,8 +105,6 @@
   Ptr<UdpL4Protocol> m_udp;
   Ipv4Address m_defaultAddress;
   uint16_t m_defaultPort;
-  Callback<void,Ptr<Socket>,uint32_t,const Address &> m_dummyRxCallback;
-  Callback<void,Ptr<Socket>,uint8_t const*,uint32_t,const Address &> m_rxCallback;
   TracedCallback<Ptr<const Packet> > m_dropTrace;
 
   enum SocketErrno m_errno;