Merge changes to make m5 g++ 3.4 compatible.

sim/param.cc:
    Merge changes.

--HG--
extra : convert_revision : b5044e1f7c48ae2d74d5233dd4fabfb7a801d7c8

diff --cc base/trace.cc
Simple merge

diff --cc dev/ns_gige.hh
Simple merge

diff --cc sim/param.cc
Simple merge

diff --cc sim/universe.cc
Simple merge