Merge with head.
authorGabe Black <gblack@eecs.umich.edu>
Sun, 29 Jul 2007 20:53:39 +0000 (13:53 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Sun, 29 Jul 2007 20:53:39 +0000 (13:53 -0700)
--HG--
extra : convert_revision : 1cf4d998699d131c3b20eef67a3c2817af0ce439


Trivial merge