Merge branch 'master' into fix-early-audio-take2
authorCarl Hetherington <cth@carlh.net>
Mon, 15 Apr 2013 21:00:04 +0000 (22:00 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 15 Apr 2013 21:00:04 +0000 (22:00 +0100)

Trivial merge