Merge with head.
authorGabe Black <gblack@eecs.umich.edu>
Sun, 29 Jul 2007 04:04:45 +0000 (21:04 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Sun, 29 Jul 2007 04:04:45 +0000 (21:04 -0700)
--HG--
extra : convert_revision : 3c1ff2585c9b20649792344b4180f6d82cef9c1b


Trivial merge