automerge
authorNathan Binkert <nate@binkert.org>
Mon, 6 Jul 2009 22:54:18 +0000 (15:54 -0700)
committerNathan Binkert <nate@binkert.org>
Mon, 6 Jul 2009 22:54:18 +0000 (15:54 -0700)

Trivial merge