Index: trunk/scripts/outage/outage-mail
===================================================================
--- trunk/scripts/outage/outage-mail	(revision 2274)
+++ trunk/scripts/outage/outage-mail	(revision 2275)
@@ -21,5 +21,5 @@
     msg['Reply-To'] = 'XVM <xvm@mit.edu>'
     msg['From'] = opts.from_addr
-    msg['Subject'] = '[xvm] Unexpected reboot of your VM %s' % vm
+    msg['Subject'] = opts.subject % vm
     smtp.sendmail(opts.from_addr,
         [contact, 'xvm@mit.edu'],
@@ -34,4 +34,9 @@
             dest = 'message',
             help = 'filename with body of message')
+    parser.add_option('-s', '--subject',
+            type = 'string',
+            dest = 'subject',
+            default = '[xvm] Unexpected reboot of your VM %s',
+            help = 'subject line of message; %s for VM name')
     parser.add_option('-f', '--from',
             type = 'string',