Merge ktlim@zamp:/z/ktlim2/clean/m5-o3
authorKevin Lim <ktlim@umich.edu>
Tue, 16 May 2006 19:30:36 +0000 (15:30 -0400)
committerKevin Lim <ktlim@umich.edu>
Tue, 16 May 2006 19:30:36 +0000 (15:30 -0400)
into  zamp.eecs.umich.edu:/z/ktlim2/clean/m5-merge

--HG--
extra : convert_revision : 077a04edf0e3e4d735e88c9741d6742666e97de6


Trivial merge