Automated merge with ssh://daystrom.m5sim.org//z/repo/m5
authorLisa Hsu <hsul@eecs.umich.edu>
Thu, 16 Oct 2008 18:16:26 +0000 (14:16 -0400)
committerLisa Hsu <hsul@eecs.umich.edu>
Thu, 16 Oct 2008 18:16:26 +0000 (14:16 -0400)

Trivial merge