Merge branch 'master' into plot-audio
authorCarl Hetherington <cth@carlh.net>
Wed, 27 Feb 2013 19:38:18 +0000 (19:38 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 27 Feb 2013 19:38:18 +0000 (19:38 +0000)

Trivial merge