[libreoffice/f17: 2/2] Merge remote-tracking branch 'origin/master' into f17

[David Tardon]

commit 0600b8a252b30d855c686de5f98fb6ea0eb7335f
Merge: 7c7b911 92a97ad
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Mar 14 14:55:09 2012 +0100

    Merge remote-tracking branch 'origin/master' into f17

 ...-of-paper-tray-from-print-dialog-fdo-4393.patch |   33 ++++++++++++++++++++
 libreoffice.spec                                   |    7 +++-
 2 files changed, 39 insertions(+), 1 deletions(-)
---