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

[Caolán McNamara]

commit 03815b0dcdce1b85fc739d5e5a51264268f3286e
Merge: b1067bf 58a829b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed May 9 12:58:27 2012 +0100

    Merge branch 'master' into f17
    
    Conflicts:
    	libreoffice.spec

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