Merge branch 'master' into plot-audio
authorCarl Hetherington <cth@carlh.net>
Tue, 26 Feb 2013 19:47:55 +0000 (19:47 +0000)
committerCarl Hetherington <cth@carlh.net>
Tue, 26 Feb 2013 19:47:55 +0000 (19:47 +0000)

Trivial merge