Merge with head.
authorGabe Black <gblack@eecs.umich.edu>
Tue, 24 Jul 2007 22:48:40 +0000 (15:48 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Tue, 24 Jul 2007 22:48:40 +0000 (15:48 -0700)
commit26b1c455e0aed69eda0cc165b5084edb1b557c38
tree0b7ffa9259c55f9a639a12f09ddef033d78b084b
parent02c39000bfc6be620382bf89636e3b1bbb2f4cf6
parentabc76f20cb98c90e8dab416dd16dfd4a954013ba
Merge with head.

--HG--
extra : convert_revision : 4a34b3f91c4fc90055596245ae3efec45ea33888