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

Trivial merge