From 4b499bdf13b61096a24eb7aa22679e7b58e57cab Mon Sep 17 00:00:00 2001
From: Steve McIntyre <93sam@debian.org>
Date: Mon, 5 Oct 2009 19:42:29 +0000
Subject: [PATCH] Merge fix for #542191 back onto the lenny branch

---
 lenny/data/lenny/README.html.in | 6 +++---
 lenny/debian/changelog          | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lenny/data/lenny/README.html.in b/lenny/data/lenny/README.html.in
index 0de70072..3ac9b71e 100644
--- a/lenny/data/lenny/README.html.in
+++ b/lenny/data/lenny/README.html.in
@@ -287,9 +287,9 @@
      bugs you find in the Debian Bug Tracking System; details at <A
      HREF="http://bugs.debian.org/">bugs.debian.org</A>.
 #endif
-      <li>If you're reporting bugs against this disc or the installation
-      system, please also mention the version of this disc; this can be found
-      in the file <tt><a href="/.disk/info">/.disk/info</a></tt>.</li>
+     <li>If you're reporting bugs against this disc or the installation
+     system, please also mention the version of this disc; this can be found
+     in the file <tt><a href=".disk/info">/.disk/info</a></tt>.</li>
 
     </ul>
 #endif
diff --git a/lenny/debian/changelog b/lenny/debian/changelog
index 84e8eedd..a96f87a5 100644
--- a/lenny/debian/changelog
+++ b/lenny/debian/changelog
@@ -1,7 +1,11 @@
 debian-cd (3.1.1lenny1) UNRELEASED; urgency=low
 
+  [ Frans Pop ]
   * sparc: display message for unsupported subarchitectures.
 
+  [ Steve McIntyre ]
+  * Fix link in README.html.in for lenny. (#542191)
+
  -- Frans Pop <fjp@debian.org>  Sat, 13 Jun 2009 16:48:51 +0200
 
 debian-cd (3.1.1) unstable; urgency=high