Merge branch 'test-fixes'
authorCarl Hetherington <cth@carlh.net>
Thu, 27 Jun 2013 18:03:45 +0000 (19:03 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 27 Jun 2013 18:03:45 +0000 (19:03 +0100)

Trivial merge