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

[Rex Dieter]

commit 97700cdf153cbb738bb169c89edca8d8fd6888c9
Merge: 2f32833 3da219b
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 14:04:11 2012 -0500

    Merge branch 'master' into f16

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