Index: /package_branches/invirt-web/cherrypy-rebased/code/templates/functions.mako
===================================================================
--- /package_branches/invirt-web/cherrypy-rebased/code/templates/functions.mako	(revision 2681)
+++ /package_branches/invirt-web/cherrypy-rebased/code/templates/functions.mako	(revision 2682)
@@ -44,4 +44,7 @@
 def jquote(string):
     return "'" + string.replace('\\', '\\\\').replace("'", "\\'").replace('\n', '\\n') + "'"
+
+def nl2br(string):
+    return string.replace('\n', '<br/>')
 %>
 
Index: /package_branches/invirt-web/cherrypy-rebased/code/templates/list.mako
===================================================================
--- /package_branches/invirt-web/cherrypy-rebased/code/templates/list.mako	(revision 2681)
+++ /package_branches/invirt-web/cherrypy-rebased/code/templates/list.mako	(revision 2682)
@@ -121,5 +121,5 @@
       </tr>
       <tr>
-        <td colspan="7" style="padding-left: 1em; color: #666">${machine.description}</td>
+        <td colspan="7" style="padding-left: 1em; color: #666">${machine.description|self.fn.module.nl2br}</td>
       </tr>
 </%def>