Fixed up so buildout build and tests run on Plone 4.1.
Tested with Python 2.7. Works with 2.6 as well of course.