Automated merge with ssh://m5sim.org//repo/m5
authorLisa Hsu <hsul@eecs.umich.edu>
Fri, 5 Dec 2008 17:11:46 +0000 (12:11 -0500)
committerLisa Hsu <hsul@eecs.umich.edu>
Fri, 5 Dec 2008 17:11:46 +0000 (12:11 -0500)

Trivial merge