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

[Caolán McNamara]

commit 38d5149588dfeb4f3bac74d5e0ec92f698a3144b
Merge: b1f7db3 f1fbd1e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 6 16:40:25 2012 +0000

    Merge branch 'master' into f17

 libreoffice.spec |   48 ++++++++++++++++++++++++------------------------
 1 files changed, 24 insertions(+), 24 deletions(-)
---