[libreoffice/f17: 2/2] Merge branch 'master' into f17

[Caolán McNamara]

commit c07846a978ab2a0461433e596383a086c67e051b
Merge: 672e7bd 30f73ca
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 26 14:32:22 2012 +0100

    Merge branch 'master' into f17

 libreoffice-multiliblauncher.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---