Index: package_branches/invirt-web/cherrypy/code/templates/functions.mako
===================================================================
--- package_branches/invirt-web/cherrypy/code/templates/functions.mako	(revision 2414)
+++ package_branches/invirt-web/cherrypy/code/templates/functions.mako	(revision 2416)
@@ -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/code/templates/info.mako
===================================================================
--- package_branches/invirt-web/cherrypy/code/templates/info.mako	(revision 2414)
+++ package_branches/invirt-web/cherrypy/code/templates/info.mako	(revision 2416)
@@ -61,5 +61,5 @@
   <input type="hidden" name="machine_id" value="${defaults.machine_id}"/>
   <table>
-    <tr><td>Description:</td><td colspan="2"><textarea name="description" rows="4" cols="60">${defaults.description}</textarea></td></tr>
+    <tr><td>Description:</td><td colspan="2"><textarea name="description" rows="4" cols="60">${defaults.description|self.fn.module.nl2br}</textarea></td></tr>
     <tr><td>Owner${self.fn.helppopup("Owner")}:</td><td><input type="text" name="owner", value="${defaults.owner}"/></td></tr>
 ${self.fn.errorRow('owner', err)}
Index: package_branches/invirt-web/cherrypy/code/templates/list.mako
===================================================================
--- package_branches/invirt-web/cherrypy/code/templates/list.mako	(revision 2414)
+++ package_branches/invirt-web/cherrypy/code/templates/list.mako	(revision 2416)
@@ -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>