merge mips fix and statetrace changes
authorKorey Sewell <ksewell@umich.edu>
Fri, 31 Jul 2009 14:40:42 +0000 (10:40 -0400)
committerKorey Sewell <ksewell@umich.edu>
Fri, 31 Jul 2009 14:40:42 +0000 (10:40 -0400)

Trivial merge