Automated merge with ssh://hg@repo.m5sim.org/m5
authorAli Saidi <Ali.Saidi@ARM.com>
Fri, 18 Mar 2011 00:24:37 +0000 (19:24 -0500)
committerAli Saidi <Ali.Saidi@ARM.com>
Fri, 18 Mar 2011 00:24:37 +0000 (19:24 -0500)

Trivial merge