[libreoffice/f17: 2/2] Merge remote-tracking branch 'origin/master' into f17

[David Tardon]

commit 8fa2c6d9111d0d91e01ce8094509e15faf5eb576
Merge: 8282d97 014f11f
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Jun 11 14:16:06 2012 +0200

    Merge remote-tracking branch 'origin/master' into f17

 0001-use-ure-instead-of-ure-link.patch |   28 ++++++++++++++++++++++++++++
 libreoffice.spec                       |    7 ++++++-
 2 files changed, 34 insertions(+), 1 deletions(-)
---