Automated merge with http://repo.m5sim.org/m5-stable
authorAli Saidi <saidi@eecs.umich.edu>
Tue, 24 Jun 2008 19:51:12 +0000 (15:51 -0400)
committerAli Saidi <saidi@eecs.umich.edu>
Tue, 24 Jun 2008 19:51:12 +0000 (15:51 -0400)

Trivial merge