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

[Caolán McNamara]

commit 0867c689563f2c1fb076b05973ab3aa18c40ef66
Merge: 40bc4d8 99cca49
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed May 9 12:51:23 2012 +0100

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

 libreoffice.spec |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)
---