Merge "Print an error message when aborted by user"
diff --git a/main.py b/main.py
index 41c3ec6..b43a48f 100755
--- a/main.py
+++ b/main.py
@@ -397,6 +397,7 @@
     finally:
       close_ssh()
   except KeyboardInterrupt:
+    print >>sys.stderr, 'aborted by user'
     result = 1
   except ManifestParseError as mpe:
     print >>sys.stderr, 'fatal: %s' % mpe