[poppler/f14/master: 4/4] Merge branch 'master' into f14

[Rex Dieter]

commit 13867ca51aaed5bd999fba8cf9faf72a97d20eeb
Merge: 5785a7d c276111
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 11 12:18:36 2010 -0500

    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	poppler.spec
    	sources

 .gitignore   |    3 +--
 poppler.spec |    5 ++++-
 sources      |    2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)
---