Ok, committed, with some small cleanup since the last patch I posted.
Could you update the directory-format patch on top of the committed version, please?
-- Heikki Linnakangas EnterpriseDB http://www.enterprisedb.com