Merge master.
authorCarl Hetherington <cth@carlh.net>
Sun, 21 Apr 2013 12:42:21 +0000 (13:42 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 21 Apr 2013 12:42:21 +0000 (13:42 +0100)

Trivial merge