Merge zizzer:/bk/newmem

into  zeep.pool:/z/saidi/work/m5.newmem.head

src/mem/packet.hh:
    hand merge

--HG--
extra : convert_revision : 3f77707360235dc98c6b12a0367ca64a401313df

diff --cc src/base/traceflags.py
Simple merge

diff --cc src/mem/packet.cc
Simple merge

diff --cc src/mem/packet.hh
Simple merge