Merge branch 'master' of ssh://cvs.cs.unc.edu/cvs/proj/litmus/repo/rthp

Conflicts:
	index.html

1 files changed, 7 insertions, 2 deletions

diff --git a/lunch.html b/lunch.html
index 553cc47..4b12416 100644
--- a/lunch.html
+++ b/lunch.html
@@ -43,15 +43,20 @@
               <td>Topic</td>
             </tr>
             <tr>
+              <td>11/25/2009</td>
+              <td><i>No talk</i></td>
+              <td><i>No talk</i></td>
+            </tr>
+            <tr>
               <td>11/18/2009</td>
               <td>Alex Mills</td>
-              <td>A Stochastic Framework for Multiprocessor Real-Time Scheduling</td>
+              <td><a href="lunch/2009-11-18-A_Stochastic_Framework_For_Multiprocessor_Real-Time_Scheduling.ppt">A Stochastic Framework for Multiprocessor Real-Time Scheduling</a></td>
             </tr>
             <tr>
             <tr>
               <td>11/11/2009</td>
               <td>Cong Liu</td>
-              <td>Task Scheduling with Self Suspensions in Soft Real-Time Multiprocessor Systems</td>
+              <td><a href="lunch/2009-11-11-Task_Scheduling_With_Self_Suspensions_In_Soft_Real-Time_Multiprocessor_Systems.ppt">Task Scheduling with Self Suspensions in Soft Real-Time Multiprocessor Systems</a></td>
             </tr>
             <tr>
               <td>11/04/2009</td>