Merge branch 'windows'
authorSam Thursfield <samthursfield@codethink.co.uk>
Mon, 23 May 2011 14:26:54 +0000 (15:26 +0100)
committerSam Thursfield <samthursfield@codethink.co.uk>
Mon, 23 May 2011 14:26:54 +0000 (15:26 +0100)

Trivial merge