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

[Caolán McNamara]

commit f37364d720e4c1088528250393211aa8b54e3535
Merge: affd039 27162f6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Apr 2 21:10:21 2012 +0100

    Merge branch 'master' into f17

 ...o-48096-torn-off-popups-trigger-keyboard-.patch |   67 ++++++++++++++++++++
 libreoffice.spec                                   |    7 ++-
 2 files changed, 73 insertions(+), 1 deletions(-)
---