Merge from head.
authorSteve Reinhardt <stever@eecs.umich.edu>
Sat, 14 Jul 2007 19:23:47 +0000 (12:23 -0700)
committerSteve Reinhardt <stever@eecs.umich.edu>
Sat, 14 Jul 2007 19:23:47 +0000 (12:23 -0700)
--HG--
extra : convert_revision : f7b3700762b796d44f99aef05783db1ee9c7412e


Trivial merge