[gwenview/f17: 10/10] Merge branch 'master' into f17

[Than Ngo]

commit 0c348edea4a80a97bdf1eb3dd02bde05387b7629
Merge: 92f5f3c b1e2160
Author: Than Ngo <than at redhat.com>
Date:   Thu Mar 7 15:02:41 2013 +0100

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	gwenview.spec
    	sources

 .gitignore    |    1 +
 gwenview.spec |   33 +++++++++++++++++++++++++--------
 sources       |    2 +-
 3 files changed, 27 insertions(+), 9 deletions(-)
---
diff --cc .gitignore
index a71faf0,f2d888d..7f9eec3
--- a/.gitignore
+++ b/.gitignore
@@@ -1,6 -1,1 +1,7 @@@
 +/gwenview-4.8.5.tar.xz
 +/gwenview-4.9.1.tar.xz
 +/gwenview-4.9.2.tar.xz
 +/gwenview-4.9.3.tar.xz
 +/gwenview-4.9.4.tar.xz
 +/gwenview-4.9.5.tar.xz
+ /gwenview-4.10.1.tar.xz