Merge branch '1.0' into 1.0-vob
authorCarl Hetherington <cth@carlh.net>
Fri, 22 Nov 2013 23:21:28 +0000 (23:21 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 22 Nov 2013 23:21:28 +0000 (23:21 +0000)

Trivial merge