[openoffice.org/f14/master: 2/2] Merge branch 'f14/master' of ssh://pkgs.fedoraproject.org/openoffice.org into f14/master

[Caolan McNamara]

commit 02fc641a79ef717142234bc952c40770b5938a44
Merge: f6f5c4c 4f8fb8b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Nov 27 16:21:22 2010 +0000

    Merge branch 'f14/master' of ssh://pkgs.fedoraproject.org/openoffice.org into f14/master

 ...fice.org-3.3.0.rhbz657541.join-paragraphs.patch |   21 ++++++++++++++++++++
 openoffice.org.spec                                |    8 ++++++-
 2 files changed, 28 insertions(+), 1 deletions(-)
---