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

[Caolán McNamara]

commit b058e7d643ea510cf2a4c342bb72e80cb7a3cf12
Merge: e2f2419 4cf2714
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 6 15:54:41 2012 +0000

    Merge branch 'master' into f17

 ...bz-800272-complain-about-unknown-command-.patch |  110 ++++++++++++++++++++
 libreoffice.spec                                   |    3 +
 2 files changed, 113 insertions(+), 0 deletions(-)
---