Automated merge with ssh://hg@m5sim.org/m5
authorDerek Hower <drh5@cs.wisc.edu>
Fri, 11 Sep 2009 03:02:13 +0000 (22:02 -0500)
committerDerek Hower <drh5@cs.wisc.edu>
Fri, 11 Sep 2009 03:02:13 +0000 (22:02 -0500)

Trivial merge