[Ns-commits] ns-3-dev

[code@nsnam.ece.gatech.edu]

---- Now _really_ fix #551
user: Gustavo J. A. M. Carneiro  <gjc at inescporto.pt>
files: wscript
url: http://code.nsnam.org/ns-3-dev/rev/ded7c46b986b


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