Fix merge of master.
authorCarl Hetherington <cth@carlh.net>
Sun, 23 Sep 2012 13:25:11 +0000 (14:25 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 23 Sep 2012 13:25:11 +0000 (14:25 +0100)

Trivial merge