Automated merge with ssh://daystrom.m5sim.org//repo/m5
authorLisa Hsu <hsul@eecs.umich.edu>
Thu, 6 Nov 2008 16:11:50 +0000 (11:11 -0500)
committerLisa Hsu <hsul@eecs.umich.edu>
Thu, 6 Nov 2008 16:11:50 +0000 (11:11 -0500)

Trivial merge