Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
authorGabe Black <gblack@eecs.umich.edu>
Sun, 12 Feb 2006 16:38:26 +0000 (11:38 -0500)
committerGabe Black <gblack@eecs.umich.edu>
Sun, 12 Feb 2006 16:38:26 +0000 (11:38 -0500)
into  zizzer.eecs.umich.edu:/z/m5/Bitkeeper/multiarch

--HG--
extra : convert_revision : 427b5c957f91e66271444acebc01e1a861790363


Trivial merge