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

[Caolán McNamara]

commit e2f241976acc04850f1be8e84bc2ecbf658808ab
Merge: 6bf7706 142e96b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 6 14:41:37 2012 +0000

    Merge branch 'master' into f17

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