[kcalc/f17: 2/2] Merge branch 'f18' into f17

[Than Ngo]

commit 120cccadbf8f7823990c6646a8107f02870e9054
Merge: aed3acb 3ab239d
Author: Than Ngo <than at redhat.com>
Date:   Fri Dec 7 10:36:45 2012 +0100

    Merge branch 'f18' into f17

 .gitignore |    1 +
 kcalc.spec |    7 +++++--
 sources    |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---