Merge branch 'windows+cc' into cairocanvas
authorJohn Emmas <johne53@tiscali.co.uk>
Mon, 13 Jan 2014 10:49:18 +0000 (10:49 +0000)
committerJohn Emmas <johne53@tiscali.co.uk>
Mon, 13 Jan 2014 10:49:18 +0000 (10:49 +0000)

Trivial merge