Merge master.

diff --cc ChangeLog
index ea301d757079f3465a3d15975d56d7c0fd0dbd78,b234f5baacc75b569f53853a522917dc3e50052e..2d380a8df4cbcd55754ffb24c5cd1f37c5b78500
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,12 +1,20 @@@
 +2013-03-02  Carl Hetherington  <cth@carlh.net>
 +
 +      * Add option to specify the DCP's frame
 +      rate (part of #56).
 +
 +      * Add a description of what each video format
 +      means to the UI.
 +
  2013-03-01  Carl Hetherington  <cth@carlh.net>
  
+       * Version 0.76beta2 released.
+ 
+ 2013-03-01  Carl Hetherington  <cth@carlh.net>
+ 
+       * Add primitive feature to plot graphs
+       of the soundtrack (#67).
+ 
        * Version 0.76beta1 released.
  
  2013-02-27  Carl Hetherington  <cth@carlh.net>

diff --cc src/wx/film_editor.cc
Simple merge