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

[Caolán McNamara]

commit 059b59ad6c77505e2dae54f7fa2a96b727dee74a
Merge: ac9a2e4 0cbc38a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon May 14 11:47:22 2012 +0100

    Merge branch 'master' into f17

 ...hbz-809019-count-mirrored-monitors-as-one.patch |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---