Automated merge with ssh://m5sim.org//repo/m5
authorAli Saidi <saidi@eecs.umich.edu>
Fri, 14 May 2010 03:48:06 +0000 (23:48 -0400)
committerAli Saidi <saidi@eecs.umich.edu>
Fri, 14 May 2010 03:48:06 +0000 (23:48 -0400)

Trivial merge