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)
--HG--
extra : convert_revision : 581e123b969fc3df30819affe524f484d03bab89


Trivial merge