Merge branch 'master' into plot-audio
authorCarl Hetherington <cth@carlh.net>
Mon, 25 Feb 2013 08:00:31 +0000 (08:00 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 25 Feb 2013 08:00:31 +0000 (08:00 +0000)

Trivial merge