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

[sbergmann]

commit 7bb29df42e0c0535f1d3c3647aa50112625dedf1
Merge: 3bdc870 9636867
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Feb 16 14:58:11 2012 +0100

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

 ...parent-misuses-of-RTL_CONSTASCII_USTRINGP.patch |   57 ++++++++++++++++++++
 libreoffice.spec                                   |    6 ++
 2 files changed, 63 insertions(+), 0 deletions(-)
---