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

[Rex Dieter]

commit eed906b100cdc38032883f1d99e3715ea7b4ff4e
Merge: a5d8da2 8fa9c03
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Dec 28 19:29:00 2012 -0600

    Merge branch 'f18' into f17

 .gitignore        |    1 +
 kde-baseapps.spec |   10 +++++-----
 sources           |    2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)
---