X-Git-Url: https://git.decadent.org.uk/gitweb/?p=debian-kernel-talk.git;a=blobdiff_plain;f=index.html;h=480752b8a46e562db5a10e5a50dfbc91add8fd71;hp=2f131ff8efefb492e1b58abf8f500addf50d4b97;hb=d1a814b3c79748dfda13e0948061aa9774cb9759;hpb=4ae4e65de0ba8481d4bdc4577b75088a69d23db0

diff --git a/index.html b/index.html
index 2f131ff..480752b 100644
--- a/index.html
+++ b/index.html
@@ -48,6 +48,7 @@
 
 <div class="slide">
 <h1>The Linux kernel in Debian</h1>
+<object data="tux-debian.svg" width="35%" align="right"></object>
 <h3>Ben Hutchings</h3>
 </div>
 
@@ -201,6 +202,38 @@
 <div class="slide">
   <h1>Credits</h1>
   <ul>
+    <li>
+      Linux 'Tux' logo &copy; Larry Ewing, Simon Budig.
+      <!--
+Redistribution is free but has to include this notice.
+      -->
+      <ul>
+	<li>Modified by me to add Debian open-ND logo</li>
+      </ul>
+    </li>
+    <li>
+      Debian open-ND logo &copy; Software in the Public Interest, Inc.
+      <!--
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+      -->
+    </li>
     <li>
       DebConf 11 logo &copy; Aur&eacute;lio A. Heckert.
       <!--