merge -r6328:6339, some files didn't merge correctly and have been added by hand. README, Makefile and doc/ have been updated to reflect the buildout changes. Two unittest have been merged into trunk too.