Automated merge with ssh://daystrom.m5sim.org//z/repo/m5
authorLisa Hsu <hsul@eecs.umich.edu>
Mon, 20 Oct 2008 02:50:53 +0000 (22:50 -0400)
committerLisa Hsu <hsul@eecs.umich.edu>
Mon, 20 Oct 2008 02:50:53 +0000 (22:50 -0400)

Trivial merge