m5: merge inorder updates
authorKorey Sewell <ksewell@umich.edu>
Sat, 27 Mar 2010 06:23:00 +0000 (02:23 -0400)
committerKorey Sewell <ksewell@umich.edu>
Sat, 27 Mar 2010 06:23:00 +0000 (02:23 -0400)

Trivial merge