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

[Caolán McNamara]

commit 34c4dce74a431c0e0925bac8347abf1bc036863e
Merge: 1774bc0 87c6375
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 6 12:43:11 2012 +0000

    Merge branch 'master' into f17

 ...bz-799525-put-flat-odf-mimetypes-in-xsltf.patch |  166 ++++++++++++++++++++
 libreoffice.spec                                   |    4 +
 2 files changed, 170 insertions(+), 0 deletions(-)
---