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

[Caolán McNamara]

commit 8282d971b8e9184a1335f445ec3115b53aedaaeb
Merge: d1578b3 71d69de
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 8 09:21:28 2012 +0100

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

 ...bz-826609-rhbz-820554-fix-smoketest-on-pp.patch |   69 ++++++++++++++++++++
 libreoffice.spec                                   |   16 ++---
 2 files changed, 74 insertions(+), 11 deletions(-)
---