[poppler] xpdf303 merge "finished"

[James Cloos]

>>>>> "AAC" == Albert Astals Cid <aacid at kde.org> writes:

AAC> Now (or maybe tomorrow european afternoon) i'm going to merge trunk
AAC> into xpdf303merge

Perhaps it would be best to create a new branch based on xpdf303merge
and merge master into that, rather than merging directly into xpdf303merge.

Alternatively, create a annodated tag of xpdf303merge before the merge,
and another after.

Either way will make it easier to analyze things.

-JimC
-- 
James Cloos <cloos at jhcloos.com>         OpenPGP: 1024D/ED7DAEA6