Fix merge.

diff --cc ChangeLog
index 7cf20305eba58436ba921e2022c5aa7d2eeea8b3,2734ef73f572949a615756b5f3c87793cf36c04d..716a130d7f0f783adf2d873640d1e031ca9ec2dc
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,12 -1,7 +1,16 @@@
 +2012-12-10  Carl Hetherington  <cth@carlh.net>
 +
 +      * Add a check-box (which defaults to on) which tells DVD-o-matic
 +      not to scan new content files to work out their length, but instead
 +      to trust the length from the header.  This length only matters for
 +      working out what thumbnails to generate, so it isn't critical.
 +      Trusting the header will speed up the "Examine Content" job by
 +      a factor of about 2, which is handy for large films.
 +
+ 2012-12-10  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 0.59 released.
+ 
  2012-12-09  Carl Hetherington  <cth@carlh.net>
  
        * Version 0.59beta5 released.