Merge branch 'master' into check-bitmaps check-bitmaps
authorCarl Hetherington <cth@carlh.net>
Wed, 1 Aug 2012 14:59:16 +0000 (15:59 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 1 Aug 2012 14:59:16 +0000 (15:59 +0100)

Trivial merge