Merge.
authorCarl Hetherington <cth@carlh.net>
Wed, 1 Aug 2012 14:58:48 +0000 (15:58 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 1 Aug 2012 14:58:48 +0000 (15:58 +0100)

Trivial merge