[libreoffice/f17: 2/2] Merge branch 'master' into f17

[Caolán McNamara]

commit 1b76f5fc4efc37053bbab39d5a219a41d426cece
Merge: 3decf5b c317f9f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Feb 15 15:54:29 2012 +0000

    Merge branch 'master' into f17

 libreoffice.spec |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---