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)
commit6a0b712a1ed855b42d1df3c31bae2eb1d52ce131
tree0c5a37e5ad7362644bda587db2dd30ece96b693e
parentf7ff068b3044706a874459afac859a38307828c9
parent4b5ba96d380cd70c103e4deee85a95633fada7da
Merge with head.

--HG--
extra : convert_revision : 9b82ba062a14032ef24b960b92d48de754463284