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

[Caolán McNamara]

commit 7c7b91125c6e44cca1608588753a633075736568
Merge: 558beca 01f4c51
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 9 12:04:12 2012 +0000

    Merge branch 'master' into f17

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