Merge with head
authorSteve Reinhardt <stever@eecs.umich.edu>
Sat, 14 Jul 2007 05:57:36 +0000 (22:57 -0700)
committerSteve Reinhardt <stever@eecs.umich.edu>
Sat, 14 Jul 2007 05:57:36 +0000 (22:57 -0700)
--HG--
extra : convert_revision : cca352f891c6668e99e56f219ca276f950ba32cf


Trivial merge