automerge
authorNathan Binkert <nate@binkert.org>
Mon, 9 Nov 2009 04:15:54 +0000 (20:15 -0800)
committerNathan Binkert <nate@binkert.org>
Mon, 9 Nov 2009 04:15:54 +0000 (20:15 -0800)

Trivial merge