# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: address@hidden
#   qn4npav5fdwfr2sp
# target_branch: bzr://bzr.sv.gnu.org/pdf/libgnupdf/trunk/
# testament_sha1: c2be6e7e2cc6bb21d576fed178f7e9b396f6c710
# timestamp: 2011-08-31 14:50:39 +0200
# base_revision_id: address@hidden
# 
# Begin patch
=== modified file 'torture/testdata/TD00001.desc'
--- torture/testdata/TD00001.desc	2010-04-20 10:57:53 +0000
+++ torture/testdata/TD00001.desc	2011-08-31 12:50:12 +0000
@@ -1,1 +1,1 @@
-JBIG2 global segment for the page @file{TD00002}.
+JBIG2 global segments for the page @file{TD00002}.

=== modified file 'torture/testdata/TD00002.desc'
--- torture/testdata/TD00002.desc	2010-04-20 10:57:53 +0000
+++ torture/testdata/TD00002.desc	2011-08-31 12:50:12 +0000
@@ -1,1 +1,1 @@
-JBIG2 page using global segment @file{TD00001}.
+JBIG2 page using global segments @file{TD00001}.

=== modified file 'torture/testdata/TD00003'
Binary files torture/testdata/TD00003	2009-08-11 14:06:26 +0000 and torture/testdata/TD00003	2011-08-31 12:50:12 +0000 differ
=== modified file 'torture/testdata/TD00003.desc'
--- torture/testdata/TD00003.desc	2009-01-10 00:45:53 +0000
+++ torture/testdata/TD00003.desc	2011-08-31 12:50:12 +0000
@@ -1,2 +1,2 @@
 Decoded JBIG2 page bitmap from page @file{TD00002} and global
-segment @file{TD00001}.
+segments @file{TD00001}.

# Begin bundle
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