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

[Caolán McNamara]

commit b6843816c1fb89d7beddbf5ef5c687bf31252289
Merge: 2297a43 4e0da48
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Mar 1 13:14:30 2012 +0000

    Merge branch 'master' into f17

 libreoffice.spec |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)
---