Merge with head.
authorGabe Black <gblack@eecs.umich.edu>
Sun, 22 Jul 2007 05:49:57 +0000 (22:49 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Sun, 22 Jul 2007 05:49:57 +0000 (22:49 -0700)
--HG--
extra : convert_revision : 9b82ba062a14032ef24b960b92d48de754463284


Trivial merge