Automated merge with ssh://m5sim.org//repo/m5
authorDerek Hower <drh5@cs.wisc.edu>
Wed, 22 Jul 2009 02:27:54 +0000 (21:27 -0500)
committerDerek Hower <drh5@cs.wisc.edu>
Wed, 22 Jul 2009 02:27:54 +0000 (21:27 -0500)

Trivial merge