From f3121aaf96a09518ab3048d0bde69169cae4be66 Mon Sep 17 00:00:00 2001
From: Marc Burns <m4burns@uwaterloo.ca>
Date: Mon, 13 Feb 2012 04:19:11 -0500
Subject: [PATCH] Release couple more talks, add new item.

---
 media/index.xml | 15 +++++++--------
 news.xml        |  5 +++++
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/media/index.xml b/media/index.xml
index 41fc034..f333288 100644
--- a/media/index.xml
+++ b/media/index.xml
@@ -11,7 +11,6 @@
     CD or DVD should you so choose.
     <ul class="media">
 
-<!-- encode failed???
 <mediaitem title="How Browsers Work">
   <abstract>
     <p>
@@ -47,7 +46,6 @@
     </p>
   </other>
 </mediaitem>
--->
 
 <mediaitem title="General Purpose Computing on Graphics Cards">
   <abstract>
@@ -124,15 +122,16 @@
   <flvfile
 </mediaitem>
 
-not finished encoding
-<mediaitem title="Machine learning vs human learning - will scientists become obsolete?">
+-->
+
+<mediaitem title="Machine learning vs human learning: will scientists become obsolete">
   <abstract><p></p></abstract>
   <presentor>Dr. Shai Ben-David</presentor>
-  <thumbnail
-  <mediafile
-  <flvfile
+  <thumbnail file="human-vs-machine-learning-thumb-small.jpg" />
+  <mediafile file="human-vs-machine-learning.mp4" type="Talk (x264)" />
+  <mediafile file="human-vs-machine-learning.mpg" type="Talk (MPG)" />
+  <flvfile   file="human-vs-machine-learning.flv" />
 </mediaitem>
--->
 
 <mediaitem title="How to build a brain: From single neurons to cognition">
   <abstract>
diff --git a/news.xml b/news.xml
index 920ddd8..1a9c7cc 100644
--- a/news.xml
+++ b/news.xml
@@ -2,6 +2,11 @@
 
 <!DOCTYPE newdefs SYSTEM "csc.dtd">
 <newsdefs> 
+<newsitem author="m4burns" date="2012-02-13">
+    <p>
+    Recorded talks from 2010 to 2012 have been added to the <a href="media">media</a> page.
+    </p>
+</newsitem>
 <newsitem author="jy2wong" date="2012-01-12">
     <p>
     Elections for Winter 2012 have concluded. The following people were elected.</p>