merge of the code from the LENA project into ns-3-dev
Contributing to the ns-3 project--------------------------------ns-3 is a free, open source software project that welcomes contributionsfrom users worldwide. Please see the following web page for how to contribute: http://www.nsnam.org/developers/contributing-code/