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

[Caolán McNamara]

commit b1f7db342d5047f47c28598edf338a4677ca8fa8
Merge: b058e7d 44033d6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 6 16:29:46 2012 +0000

    Merge branch 'master' into f17

 ...bz-800272-complain-about-unknown-command-.patch |    4 ++--
 libreoffice-libwpd08-1.patch                       |   10 ----------
 libreoffice.spec                                   |   13 +++++++++++++
 3 files changed, 15 insertions(+), 12 deletions(-)
---