Merge branch 'master' into wx
authorCarl Hetherington <cth@carlh.net>
Tue, 24 Jul 2012 22:37:32 +0000 (23:37 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 24 Jul 2012 22:37:32 +0000 (23:37 +0100)

Trivial merge