SimpleRouter,Testのコンパイルエラー解消のみ
four campuses
Merge branch 'TestSuite' of github.com:TakashiSasaki/ns3-abe into morisada
Merge ../../../../ns-3.17/scratch into morisada

Conflicts:
	EunetSwitch/EunetSimulation.cc
	EunetSwitch/EunetSwitchTest.cc
fixed to run 'make visualize' properly.