Merge with head.
authorGabe Black <gblack@eecs.umich.edu>
Sun, 19 Aug 2007 02:41:08 +0000 (19:41 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Sun, 19 Aug 2007 02:41:08 +0000 (19:41 -0700)
--HG--
extra : convert_revision : 6ce77b5bd4f43ddecd51ea8c66759e4b70d4ad82


Trivial merge