Merge with head.
authorGabe Black <gblack@eecs.umich.edu>
Tue, 28 Aug 2007 01:33:47 +0000 (18:33 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Tue, 28 Aug 2007 01:33:47 +0000 (18:33 -0700)
commit3ab19130770e04aaede1a3582959a01bb482b96b
treeaaecc84b00b7d96337e41e5896cefbd94b53d9be
parentb84704173ee621daf09dfd76a3f4f78b2115778f
parent9791b0f9270695c7bbc552bc4a5f92f40c4e7ec7
Merge with head.

--HG--
extra : convert_revision : 581e123b969fc3df30819affe524f484d03bab89