by will
Merge branch 'master' of https://github.com/bcl104/ns3.git

Conflicts:
	scratch/phy-test.cc
by will
Merge branch 'master' of https://github.com/bcl104/ns3.git
by will