Merge branch 'master' into debug-i18n
authorCarl Hetherington <cth@carlh.net>
Mon, 15 Apr 2013 17:46:34 +0000 (18:46 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 15 Apr 2013 17:46:34 +0000 (18:46 +0100)

Trivial merge