Merge branch 'master' into speed-up
authorCarl Hetherington <cth@carlh.net>
Mon, 10 Dec 2012 23:47:34 +0000 (23:47 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 10 Dec 2012 23:47:34 +0000 (23:47 +0000)

Trivial merge