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

[Rex Dieter]

commit bcfd185663d7fe57aeb5f90e15078ee7f0ec482d
Merge: 84b3623 664a9b4
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 29 17:03:44 2012 -0500

    Merge branch 'f18' into f17

 .gitignore |    1 +
 kmag.spec  |    5 ++++-
 sources    |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---