Merge from vendor branch TNF:

Merge from vendor branch TNF:
OpenOffice.org is a multiplatform and multilingual office suite and an
open-source project. Compatible with all other major office suites, the
product is free to download, use, and distribute.

New features in version 2 include:
* Open Standards XML File Format (OASIS OpenDocument)
* New CustomShapes (compatible with Microsoft AutoShapes)
* Enhanced PDF Export
* New enhanced Database Frontend
* Mail Merge Wizard
* Support for Nested Tables
* Digital Signatures Support
* XForms Support
* WordPerfect Filters

A complete list is available at
http://marketing.openoffice.org/2.0/featureguide.html.

This package was submitted by Geert Hendrickx to tech-pkg, based on an
earlier version posted there by myself.