Merge.
authorCarl Hetherington <cth@carlh.net>
Fri, 31 May 2013 21:08:34 +0000 (22:08 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 31 May 2013 21:08:34 +0000 (22:08 +0100)

Trivial merge