Update to ooo-build 2.1,
and fixes the build that is reported by kris.
The `base' version should ooo-build and openoffic.org-2 should
be the same.