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

[David Tardon]

commit 0b2b351ceaf9214b4a30812637dbd08d60ee45bf
Merge: 7bb29df 7f7ccad
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Feb 28 08:03:06 2012 +0100

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

 .gitignore       |    4 ++++
 libreoffice.spec |   45 +++++++++++++++++++++------------------------
 sources          |    8 ++++----
 3 files changed, 29 insertions(+), 28 deletions(-)
---