[kcalc/f18: 9/9] Merge branch 'master' into f18

[Than Ngo]

commit ba2a2c3ceea596212158bc7f91bdd3606f6d6330
Merge: 9a8ded2 38e6929
Author: Than Ngo <than at redhat.com>
Date:   Mon Mar 4 16:52:18 2013 +0100

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	kcalc.spec
    	sources

 .gitignore              |    1 +
 kcalc-4.9.2-misc.patch  |   42 ------------------------------------------
 kcalc-4.9.90-misc.patch |   32 ++++++++++++++++++++++++++++++++
 kcalc.spec              |   29 ++++++++++++++++++++++++-----
 sources                 |    2 +-
 5 files changed, 58 insertions(+), 48 deletions(-)
---
diff --cc .gitignore
index cb93292,f9c748d..f21fb94
--- a/.gitignore
+++ b/.gitignore
@@@ -1,6 -1,1 +1,7 @@@
 +/kcalc-4.8.5.tar.xz
 +/kcalc-4.9.1.tar.xz
 +/kcalc-4.9.2.tar.xz
 +/kcalc-4.9.3.tar.xz
 +/kcalc-4.9.4.tar.xz
 +/kcalc-4.9.5.tar.xz
+ /kcalc-4.10.1.tar.xz