merge from my list-data-struct local branch of Flavio meld