Merge branch 'ubuntu-build'
authorCarl Hetherington <cth@carlh.net>
Fri, 28 Sep 2012 12:17:15 +0000 (13:17 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 28 Sep 2012 12:17:15 +0000 (13:17 +0100)

Trivial merge