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

[Rex Dieter]

commit c2fd102ade579b7b621330e150b047efe139cb02
Merge: adcfbc3 53f8d09
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Sep 7 12:03:00 2012 -0500

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

 .gitignore    |    3 +--
 gwenview.spec |   36 ++++++++++++++++++++++++++++--------
 sources       |    2 +-
 3 files changed, 30 insertions(+), 11 deletions(-)
---