[kde-baseapps/f17: 3/3] Merge branch 'f18' into f17

[Rex Dieter]

commit b2064d924cef968d03a4496597eaf403f38bc722
Merge: de594b2 3b629ac
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Nov 6 14:27:23 2012 -0600

    Merge branch 'f18' into f17

 .gitignore                                 |    1 +
 kde-baseapps-4.9.2-konqueror-mimetyp.patch |   11 +++++++++++
 kde-baseapps.spec                          |   15 +++++++++++++--
 sources                                    |    2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)
---