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

[Rex Dieter]

commit 7f4a1816a38385591a72b0edcb743245f9131f83
Merge: cf1e2d1 b475b72
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Mar 7 23:53:09 2012 -0600

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

 .gitignore    |    1 +
 gwenview.spec |   31 ++++++++++++++++++++++++++-----
 sources       |    2 +-
 3 files changed, 28 insertions(+), 6 deletions(-)
---