[kolourpaint/f16: 2/2] Merge branch 'f17' into f16

[Rex Dieter]

commit 5d73108b8d275dd894b643851d418571e5b61546
Merge: 7e5abf3 fe125ac
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Aug 3 07:24:18 2012 -0500

    Merge branch 'f17' into f16

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