[epdfview/f15: 6/6] Merge branch 'master' into f15

[Michal Schmidt]

commit 73366bd2a59ff2ed85a25113c8dd35948e333e7f
Merge: 5d91b48 63d8205
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Thu Jun 2 01:23:50 2011 +0200

    Merge branch 'master' into f15
    
    Conflicts:
    	epdfview.spec

 .gitignore                  |    2 +
 epdfview-poppler-0.15.patch |   72 -------------------------------------------
 epdfview.spec               |   37 +++++++++++-----------
 sources                     |    2 +-
 4 files changed, 21 insertions(+), 92 deletions(-)
---