From 74a661ee00ca6241bc354bc8de26c19a4321fa56 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sun, 7 Feb 2010 09:00:18 +0000
Subject: [PATCH] Merge from trunk.

[SVN r59545]
---
 test/{include.gold => include_1_5.gold} | 6 ++++++
 test/include_1_5.quickbook              | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)
 rename test/{include.gold => include_1_5.gold} (79%)

diff --git a/test/include.gold b/test/include_1_5.gold
similarity index 79%
rename from test/include.gold
rename to test/include_1_5.gold
index 90bdd09..c590619 100644
--- a/test/include.gold
+++ b/test/include_1_5.gold
@@ -11,4 +11,10 @@
       Just testing.
     </para>
   </section>
+  <section id="foo.test">
+    <title><link linkend="foo.test"> Test</link></title>
+    <para>
+      Just testing.
+    </para>
+  </section>
 </article>
diff --git a/test/include_1_5.quickbook b/test/include_1_5.quickbook
index c1b676b..7da3b62 100644
--- a/test/include_1_5.quickbook
+++ b/test/include_1_5.quickbook
@@ -4,4 +4,5 @@
 ]
 
 [include include-sub.quickbook]
-[include include-sub2.quickbook]
\ No newline at end of file
+[include include-sub2.quickbook]
+[include:foo include-sub2.quickbook]
\ No newline at end of file