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

[Caolán McNamara]

commit 672e7bda5481cf46cccf6c5f8ac05315944270a8
Merge: 2976a85 680040b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 26 14:17:26 2012 +0100

    Merge branch 'master' into f17

 ...bz-806663-SlideshowImpl-can-outlive-SdMod.patch |   26 ++++++++++++++++++++
 libreoffice.spec                                   |    7 ++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---