Merge.

diff --cc ChangeLog
index 0e4f2d1b428e02ebd9d614ce95540837dbba3406,543e38b76fa1bbd2a6492b03203922e1e33f9530..03af7d2b7df5d6a71cf51063ce2bcc78686282d5
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,7 +1,11 @@@
+ 2013-03-26  Carl Hetherington  <cth@carlh.net>
+ 
+       * Add button to cancel jobs.
+ 
 +2013-03-26  Carl Hetherington  <cth@carlh.net>
 +
 +      * Version 0.78beta7 released.
 +
  2013-03-25  Carl Hetherington  <cth@carlh.net>
  
        * Add option to set user interface language.