diff -Naurw /home/mike/moodle-clean/moodle/blocks/mrbs/web/day.php /home/mike/moodle-dev/mrbs/web/day.php
--- /home/mike/moodle-clean/moodle/blocks/mrbs/web/day.php	2009-04-21 11:49:32.000000000 +0100
+++ /home/mike/moodle-dev/mrbs/web/day.php	2009-04-21 12:23:50.000000000 +0100
@@ -186,10 +186,20 @@
 	   $end_t = min(round_t_up($row[2], $resolution, $am7) - $resolution, $pm7);
 	   for ($t = $start_t; $t <= $end_t; $t += $resolution)
 	   {
+          //checks for double bookings
+          if(empty($today[$row[0]][date($format,$t)])){
+          
 		  $today[$row[0]][date($format,$t)]["id"]    = $row[4];
 		  $today[$row[0]][date($format,$t)]["color"] = $row[5];
-		  $today[$row[0]][date($format,$t)]["data"]  = "";
-		  $today[$row[0]][date($format,$t)]["long_descr"]  = "";
+              $today[$row[0]][date($format,$t)]["data"]  .= "";
+              $today[$row[0]][date($format,$t)]["long_descr"]  .= "";
+              $today[$row[0]][date($format,$t)]["double_booked"]  = false;
+          }else{
+              $today[$row[0]][date($format,$t)]["id"]    .= ','.$row[4];
+              $today[$row[0]][date($format,$t)]["data"]  .= "\n";
+              $today[$row[0]][date($format,$t)]["long_descr"]  .= ",";
+              $today[$row[0]][date($format,$t)]["double_booked"]  = true;
+          }
 	   }
 
 	   # Show the name of the booker in the first segment that the booking
@@ -331,6 +341,8 @@
 				$color = $today[$room][$time_t]["color"];
 				$descr = htmlspecialchars($today[$room][$time_t]["data"]);
 				$long_descr = htmlspecialchars($today[$room][$time_t]["long_descr"]);
+                $double_booked = $today[$room][$time_t]["double_booked"];
+                if($double_booked) $color='DoubleBooked';
 			}
 			else
 				unset($id);
@@ -375,13 +387,27 @@
 					}
 				} else echo '&nbsp;';
 			}
-			elseif ($descr != "")
+            elseif ($double_booked){
+                $descrs=split("\n",$descr);
+                $long_descrs=split(",",$long_descr);
+                $ids=split(",",$id);
+            }else{
+                $descrs[]=$descr;
+                $long_descrs[]=$long_descr;
+                $ids[]=$id;
+            }
+            for($i=0;$i<count($descrs);$i++){
+                if ($descrs[$i] != "")
 			{
 				#if it is booked then show
-				echo " <a href=\"view_entry.php?id=$id&area=$area&day=$day&month=$month&year=$year\" title=\"$long_descr\">$descr</a>";
+                echo " <a href=\"view_entry.php?id=$ids[$i]&area=$area&day=$day&month=$month&year=$year\" title=\"$long_descrs[$i]\">$descrs[$i]</a><br>";
 			}
 			else
-				echo "&nbsp;\"&nbsp;";
+                    echo "<a href=\"view_entry.php?id=$ids[$i]&area=$area&day=$day&month=$month&year=$year\" title=\"$long_descrs[$i]\">&nbsp;\"&nbsp;</a><br>";
+            }
+            unset($descrs);
+            unset($long_descrs);
+            unset($ids);
 
 			echo "</td>\n";
 		}
diff -Naurw /home/mike/moodle-clean/moodle/blocks/mrbs/web/mrbs.css /home/mike/moodle-dev/mrbs/web/mrbs.css
--- /home/mike/moodle-clean/moodle/blocks/mrbs/web/mrbs.css	2008-11-26 11:58:23.000000000 +0000
+++ /home/mike/moodle-dev/mrbs/web/mrbs.css	2009-04-21 12:12:28.000000000 +0100
@@ -52,6 +52,7 @@
 TD.I {background-color:#DDFFDD}
 TD.J {background-color:#CCCCCC}
 TD.white {background-color:#FFFFFF}
+TD.DoubleBooked {background-color:#FF0000}
 
 TD.calendar { border:0px; font-size: 8pt}
 TD.calendarHeader {border:0px; font-size: 10pt}