Automated merge with ssh://m5sim.org//repo/m5
authorLisa Hsu <hsul@eecs.umich.edu>
Wed, 5 Nov 2008 23:12:21 +0000 (18:12 -0500)
committerLisa Hsu <hsul@eecs.umich.edu>
Wed, 5 Nov 2008 23:12:21 +0000 (18:12 -0500)

Trivial merge