merge
authorNathan Binkert <nate@binkert.org>
Sun, 12 Aug 2007 16:56:37 +0000 (09:56 -0700)
committerNathan Binkert <nate@binkert.org>
Sun, 12 Aug 2007 16:56:37 +0000 (09:56 -0700)
--HG--
extra : convert_revision : 5866eaa4008c4fa5da7fbb443132b8326955f71d


Trivial merge