Automated merge with ssh://m5sim.org//repo/m5
authorSteve Reinhardt <stever@gmail.com>
Fri, 13 Jun 2008 05:59:10 +0000 (01:59 -0400)
committerSteve Reinhardt <stever@gmail.com>
Fri, 13 Jun 2008 05:59:10 +0000 (01:59 -0400)

Trivial merge