I merged the two patches, and committed them.

-- 
Jerome