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

[David Tardon]

commit 172af35f7dfeafbe715a191a91bc0a5586b604a0
Merge: 38d5149 a51ba4b
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Mar 7 11:55:20 2012 +0100

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

 .gitignore       |    4 ++++
 libreoffice.spec |    7 +++++--
 sources          |    8 ++++----
 3 files changed, 13 insertions(+), 6 deletions(-)
---