diff -r 5370849d0b76 examples/wscript
--- a/examples/wscript	Wed May 21 21:20:30 2008 -0700
+++ b/examples/wscript	Fri May 23 13:58:17 2008 -0400
@@ -58,3 +58,7 @@ def build(bld):
                                  ['core', 'simulator', 'mobility', 'wifi'])
     obj.source = 'wifi-ap.cc'
 
+    obj = bld.create_ns3_program('trace-test',
+                                 ['core', 'simulator', 'mobility', 'wifi'])
+    obj.source = 'trace-test.cc'
+
diff -r 5370849d0b76 src/core/random-variable.cc
--- a/src/core/random-variable.cc	Wed May 21 21:20:30 2008 -0700
+++ b/src/core/random-variable.cc	Fri May 23 13:58:17 2008 -0400
@@ -1095,9 +1095,17 @@ NormalVariable::NormalVariable()
 NormalVariable::NormalVariable()
   : RandomVariable (NormalVariableImpl ())
 {}
+NormalVariable::NormalVariable(double m, double v)
+  : RandomVariable (NormalVariableImpl (m, v))
+{}
 NormalVariable::NormalVariable(double m, double v, double b)
   : RandomVariable (NormalVariableImpl (m, v, b))
 {}
+double 
+NormalVariable::GetSingleValue(double m, double v)
+{
+  return NormalVariableImpl::GetSingleValue (m, v);
+}
 double 
 NormalVariable::GetSingleValue(double m, double v, double b)
 {
diff -r 5370849d0b76 src/core/random-variable.h
--- a/src/core/random-variable.h	Wed May 21 21:20:30 2008 -0700
+++ b/src/core/random-variable.h	Fri May 23 13:58:17 2008 -0400
@@ -490,12 +490,18 @@ class NormalVariable : public RandomVari
 class NormalVariable : public RandomVariable
 {
 public:
-   static const double INFINITE_VALUE;
   /**
    * Constructs an normal random variable  with a mean
    * value of 0 and variance of 1.
    */ 
   NormalVariable();
+
+  /**
+   * \brief Construct a normal random variable with specified mean and variance.
+   * \param m Mean value
+   * \param v Variance
+   */ 
+  NormalVariable(double m, double v);
 
   /**
    * \brief Construct a normal random variable with specified mean and variance
@@ -503,14 +509,22 @@ public:
    * \param v Variance
    * \param b Bound.  The NormalVariable is bounded within +-bound.
    */ 
-  NormalVariable(double m, double v, double b = INFINITE_VALUE);
+  NormalVariable(double m, double v, double b);
+
+  /**
+   * \param m Mean value
+   * \param v Variance
+   * \return A random number from a distribution specified by m, and v.
+   */ 
+  static double GetSingleValue(double m, double v);
+
   /**
    * \param m Mean value
    * \param v Variance
    * \param b Bound.  The NormalVariable is bounded within +-bound.
    * \return A random number from a distribution specified by m,v, and b.
    */ 
-  static double GetSingleValue(double m, double v, double b = INFINITE_VALUE);
+  static double GetSingleValue(double m, double v, double b);
 };
 
 /**