Merge zizzer:/bk/m5

into  pb15.local:/Users/ali/work/m5.head

--HG--
extra : convert_revision : 774e4afbb0f9c3ae62843138b6d7195ea184ff92

diff --cc SConscript
Simple merge

diff --cc sim/syscall_emul.cc
Simple merge

diff --cc sim/syscall_emul.hh
Simple merge