[kolourpaint/f16: 9/9] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit 2f32833a61c32dd788b458826e37e3f92faaf887
Merge: 663e07c 1a45034
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 8 00:46:19 2012 -0600

    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	kolourpaint.spec
    	sources

 .gitignore       |    3 +--
 kolourpaint.spec |   30 +++++++++++++++++++++++++-----
 sources          |    2 +-
 3 files changed, 27 insertions(+), 8 deletions(-)
---