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

[Rex Dieter]

commit c509fe77c3c5b93755601e7a60dd06cc3af4b791
Merge: 09bea41 7d65b09
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 13:54:54 2012 -0500

    Merge branch 'master' into f16

 .gitignore                                         |    1 +
 gwenview-4.8.1-gvpart_cursor.patch                 |   24 -----------------
 gwenview-4.8.1-gvpart_documentviewcontainter.patch |   28 --------------------
 gwenview.spec                                      |   16 ++++-------
 sources                                            |    2 +-
 5 files changed, 8 insertions(+), 63 deletions(-)
---