Merge branch 'bug-120'
authorCarl Hetherington <cth@carlh.net>
Mon, 22 Apr 2013 23:05:16 +0000 (00:05 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 22 Apr 2013 23:05:16 +0000 (00:05 +0100)

Trivial merge