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

[Caolán McNamara]

commit acd49b0d864661b7a49b1a248c980497a0989cdd
Merge: ab44417 9a090ea
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 10 14:53:03 2012 +0100

    Merge branch 'master' into f17

 ...de-and-use-proper-register-names-for-linu.patch |   44 ++++++++++++++++++++
 libreoffice.spec                                   |   12 ++++-
 2 files changed, 53 insertions(+), 3 deletions(-)
---