[pypoppler/f16: 10/10] Merge branch 'master' into f16

[Fabian Affolter]

commit 8769ef149b01ec6ae5a3d7444e81e71566e316a7
Merge: 3fc2e79 950eceb
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Sun Jan 6 21:01:50 2013 +0100

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

 alexandervdm_316722.patch |   66 +++++++++++++++++++++++++++++++++++++++++++++
 pypoppler.spec            |   47 +++++++++++++++++++++-----------
 2 files changed, 97 insertions(+), 16 deletions(-)
---