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

[David Tardon]

commit 2976a857fda06bf3d1a691460b95d212c69da466
Merge: 0600b8a 3d0064d
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Mar 26 06:47:19 2012 +0200

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

 .gitignore                                   |    4 ++++
 libreoffice-ensure-non-broken-xml-tree.patch |   13 -------------
 libreoffice.spec                             |   22 ++++++++++++----------
 sources                                      |    8 ++++----
 4 files changed, 20 insertions(+), 27 deletions(-)
---