Merge branch 'master' into debian-dbg
authorCarl Hetherington <cth@carlh.net>
Mon, 22 Apr 2013 13:44:50 +0000 (14:44 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 22 Apr 2013 13:44:50 +0000 (14:44 +0100)

Trivial merge