Merge branch 'cairocanvas' into windows+cc
authorJohn Emmas <johne53@tiscali.co.uk>
Wed, 25 Sep 2013 14:52:11 +0000 (15:52 +0100)
committerJohn Emmas <johne53@tiscali.co.uk>
Wed, 25 Sep 2013 14:52:11 +0000 (15:52 +0100)

Trivial merge