Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem

into  zizzer.eecs.umich.edu:/.automount/zower/eecshome/m5/newmem-statetrace-test

--HG--
extra : convert_revision : fcbc63179c7ca54391d42f83366edcc96d09005b

tests/long/70.twolf/test.py

@@ -37,5 +37,11 @@ cwd = root.system.cpu.workload.cwd
 #Remove two files who's presence or absence affects execution
 sav_file = os.path.join(cwd, workload.input_set + '.sav')
 sv2_file = os.path.join(cwd, workload.input_set + '.sv2')
-os.unlink(sav_file)
-os.unlink(sv2_file)
+try:
+    os.unlink(sav_file)
+except:
+    print "Couldn't unlink ", sav_file
+try:
+    os.unlink(sv2_file)
+except:
+    print "Couldn't unlink ", sv2_file