Merge.
authorCarl Hetherington <cth@carlh.net>
Mon, 28 May 2012 14:14:20 +0000 (15:14 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 28 May 2012 14:14:20 +0000 (15:14 +0100)

Trivial merge