automerge
authorNathan Binkert <nate@binkert.org>
Fri, 10 Oct 2008 17:38:53 +0000 (10:38 -0700)
committerNathan Binkert <nate@binkert.org>
Fri, 10 Oct 2008 17:38:53 +0000 (10:38 -0700)

Trivial merge