Merge ktlim@zizzer:/bk/newmem

into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge

--HG--
extra : convert_revision : 037fe9ee54da7e11c2bd07388b9f79cda9abef4c

diff --cc SConstruct
Simple merge

diff --cc src/cpu/SConscript
Simple merge

diff --cc src/python/m5/__init__.py
Simple merge