merge with HEAD

.hgtags

@@ -16,3 +16,4 @@ b17f2928291eec5bf5b1c59a4a5fd583f704ac40 ns-3.0.12
 ea16c44eb90db579c83d3434fc8a960be506a7f5 ns-3.1-RC3
 42504fb1f7be7817b8be513cdcd3d9bc8f3660e8 ns-3.1
 5768685f9fdba9fbf2e9561a840f085142c73575 ns-3.1
+dfd634417b8d1896d981b6f44d8f71030611596a ns-3.2-RC1

AUTHORS

@@ -8,3 +8,5 @@ Emmanuelle Laprise (emmmanuelle.laprise@bluekazoo.ca)
 Federico Maguolo (maguolof@dei.unipd.it)
 George F. Riley (riley@ece.gatech.edu)
 Guillaume Vu-Brugier (gvubrugier@gmail.com)
+Florian Westphal (fw@strlen.de)
+

CHANGES.html

@@ -45,6 +45,31 @@ us a note on ns-developers mailing list.  </p>
 
 <hr>
 <h1>changes from ns-3.1 to ns-3.2</h1>
+
+<h2>new API:</h2>
+
+<li>26-08-2008; changeset 
+<a href="http://code.nsnam.org/ns-3-dev/rev/5aa65b1ea001">5aa65b1ea001</a></li>
+<ul>
+<li>
+Add multithreaded and real-time simulator implementation.  Allows for emulated
+net devices running in threads other than the main simulation thread to schedule
+events.  Allows for pacing the simulation clock at 1x real-time.
+</li>
+</ul>
+</li>
+
+
+<li>26-08-2008; changeset 
+<a href="http://code.nsnam.org/ns-3-dev/rev/c69779f5e51e">c69779f5e51e</a></li>
+<ul>
+<li>
+Add threading and synchronization primitives.  Enabling technology for 
+multithreaded simulator implementation.
+</li>
+</ul>
+</li>
+
 <h2>new API in existing classes:</h2>
 
 <ul>

RELEASE_NOTES

@@ -20,6 +20,7 @@ New functionality added
   implementation a replaceable component via the 
   "SimulatorImplementationType" global value.
   Hint:  try ./waf --run "udp-echo --PrintGlobals"
+- Added multithreaded and real-time simulator implementation;
 - implement Packet::PeekHeader and Packet::PeekTrailer to avoid evil workarounds when receiving tcp packets. 
 
 Bugs fixed

src/internet-stack/wscript

@@ -105,3 +105,4 @@ def build(bld):
         obj.source.append ('nsc-tcp-l4-protocol.cc')
         obj.source.append ('nsc-tcp-socket-factory-impl.cc')
         obj.source.append ('nsc-sysctl.cc')
+        obj.uselib = 'DL'