[Ns-commits] ns-3-dev

[code@nsnam-code.ece.gatech.edu]

---- Fix build when ns3_module_*__local.py files are used.
user: Gustavo J. A. M. Carneiro  <gjc at inescporto.pt>
files: bindings/python/wscript
url: http://code.nsnam.org/ns-3-dev/rev/f548d13ffd4e


---- merge
user: Gustavo J. A. M. Carneiro  <gjc at inescporto.pt>
files: 
url: http://code.nsnam.org/ns-3-dev/rev/967bf4132c6f