[pypoppler/f15: 3/3] Merge branch 'master' into f15

[Fabian Affolter]

commit 0d99b9cfdfb4a3b522c08df6e345af62845172da
Merge: b0c6010 a28ab27
Author: Fabian Affolter <fabian at bernewireless.net>
Date:   Thu Jul 14 17:34:28 2011 +0200

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

 pypoppler.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---