Merge master.
authorCarl Hetherington <cth@carlh.net>
Tue, 21 May 2013 11:51:43 +0000 (12:51 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 21 May 2013 11:51:43 +0000 (12:51 +0100)

Trivial merge