Merge branch 'new-env-test'
authorCarl Hetherington <cth@carlh.net>
Sat, 1 Dec 2012 19:00:02 +0000 (19:00 +0000)
committerCarl Hetherington <cth@carlh.net>
Sat, 1 Dec 2012 19:00:02 +0000 (19:00 +0000)

Trivial merge