Merge more changes in from head.
authorSteve Reinhardt <stever@eecs.umich.edu>
Sun, 22 Jul 2007 15:10:59 +0000 (08:10 -0700)
committerSteve Reinhardt <stever@eecs.umich.edu>
Sun, 22 Jul 2007 15:10:59 +0000 (08:10 -0700)
--HG--
extra : convert_revision : 8f170f2754eccdb424a35b5b077225abcf6eee72


Trivial merge